chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] deleted current extras/multipath directory
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 5737c84c9d16fec99f1e337426b093522c580278..8752f595d6699e7862d8a9b1b80e52dc951b5b8b 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-73,13
+73,13
@@
do { \
strncat(to, from, sizeof(to) - strlen(to)-1); \
} while (0)
strncat(to, from, sizeof(to) - strlen(to)-1); \
} while (0)
-#define str
nfieldcpy
(to, from, maxsize) \
+#define str
fieldcpymax
(to, from, maxsize) \
do { \
to[maxsize-1] = '\0'; \
strncpy(to, from, maxsize-1); \
} while (0)
do { \
to[maxsize-1] = '\0'; \
strncpy(to, from, maxsize-1); \
} while (0)
-#define str
nfieldcat
(to, from, maxsize) \
+#define str
fieldcatmax
(to, from, maxsize) \
do { \
to[maxsize-1] = '\0'; \
strncat(to, from, maxsize - strlen(to)-1); \
do { \
to[maxsize-1] = '\0'; \
strncat(to, from, maxsize - strlen(to)-1); \
@@
-91,12
+91,18
@@
do { \
snprintf((to) + strlen(to), sizeof(to) - strlen(to)-1, "%u", i); \
} while (0)
snprintf((to) + strlen(to), sizeof(to) - strlen(to)-1, "%u", i); \
} while (0)
-#define str
nintcat
(to, i, maxsize) \
+#define str
intcatmax
(to, i, maxsize) \
do { \
to[maxsize-1] = '\0'; \
snprintf((to) + strlen(to), maxsize - strlen(to)-1, "%u", i); \
} while (0)
do { \
to[maxsize-1] = '\0'; \
snprintf((to) + strlen(to), maxsize - strlen(to)-1, "%u", i); \
} while (0)
+#define foreach_strpart(str, separator, pos, len) \
+ for(pos = str, len = 0; \
+ (pos) < ((str) + strlen(str)); \
+ pos = pos + len + strspn(pos, separator), len = strcspn(pos, separator)) \
+ if (len > 0)
+
static inline char *get_action(void)
{
char *action;
static inline char *get_action(void)
{
char *action;