X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=util.h;h=30a0616d542060d8c98aa3028c0eab95a914d727;hp=71645a70ccc076d54e698757096d2b3eaba727d1;hb=70123e68a04016efca9266fc22dd05a0a7fd2d51;hpb=65d2ebdc3408c81a947de8712b37b9398d955465

diff --git a/util.h b/util.h
index 71645a70c..30a0616d5 100644
--- a/util.h
+++ b/util.h
@@ -39,6 +39,7 @@ typedef uint64_t usec_t;
 
 /* What is interpreted as whitespace? */
 #define WHITESPACE " \t\n\r"
+#define NEWLINE "\n\r"
 
 usec_t now(clockid_t clock);
 
@@ -99,13 +100,13 @@ char *split(const char *c, size_t *l, const char *separator, char **state);
 char *split_quoted(const char *c, size_t *l, char **state);
 
 #define FOREACH_WORD(word, length, s, state)                            \
-        for ((state) = NULL, (word) = split((s), &(l), WHITESPACE, &(state)); (word); (word) = split((s), &(l), WHITESPACE, &(state)))
+        for ((state) = NULL, (word) = split((s), &(length), WHITESPACE, &(state)); (word); (word) = split((s), &(length), WHITESPACE, &(state)))
 
 #define FOREACH_WORD_SEPARATOR(word, length, s, separator, state)       \
-        for ((state) = NULL, (word) = split((s), &(l), (separator), &(state)); (word); (word) = split((s), &(l), (separator), &(state)))
+        for ((state) = NULL, (word) = split((s), &(length), (separator), &(state)); (word); (word) = split((s), &(length), (separator), &(state)))
 
 #define FOREACH_WORD_QUOTED(word, length, s, state)                     \
-        for ((state) = NULL, (word) = split_quoted((s), &(l), &(state)); (word); (word) = split_quoted((s), &(l), &(state)))
+        for ((state) = NULL, (word) = split_quoted((s), &(length), &(state)); (word); (word) = split_quoted((s), &(length), &(state)))
 
 char **split_path_and_make_absolute(const char *p);
 
@@ -129,13 +130,20 @@ char **strv_path_make_absolute_cwd(char **l);
 int reset_all_signal_handlers(void);
 
 char *strstrip(char *s);
+char *delete_chars(char *s, const char *bad);
+char *truncate_nl(char *s);
+
 char *file_in_same_dir(const char *path, const char *filename);
 int mkdir_parents(const char *path, mode_t mode);
 
+int get_process_name(pid_t pid, char **name);
+
 char hexchar(int x);
 int unhexchar(char c);
 char octchar(int x);
 int unoctchar(char c);
+char decchar(int x);
+int undecchar(char c);
 
 char *cescape(const char *s);
 char *cunescape(const char *s);
@@ -151,6 +159,10 @@ char *xescape(const char *s, const char *bad);
 char *bus_path_escape(const char *s);
 char *bus_path_unescape(const char *s);
 
+bool ignore_file(const char *filename);
+
+bool chars_intersect(const char *a, const char *b);
+
 #define DEFINE_STRING_TABLE_LOOKUP(name,type)                           \
         const char *name##_to_string(type i) {                          \
                 if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
@@ -159,15 +171,26 @@ char *bus_path_unescape(const char *s);
         }                                                               \
         type name##_from_string(const char *s) {                        \
                 type i;                                                 \
+                unsigned u = 0;                                         \
                 assert(s);                                              \
                 for (i = 0; i < (type)ELEMENTSOF(name##_table); i++)    \
                         if (streq(name##_table[i], s))                  \
                                 return i;                               \
+                if (safe_atou(s, &u) >= 0 &&                            \
+                    u < ELEMENTSOF(name##_table))                       \
+                        return (type) u;                                \
                 return (type) -1;                                       \
         }                                                               \
         struct __useless_struct_to_allow_trailing_semicolon__
 
 
+int fd_nonblock(int fd, bool nonblock);
+int fd_cloexec(int fd, bool cloexec);
+
+int close_all_fds(const int except[], unsigned n_except);
+
+extern char * __progname;
+
 const char *ioprio_class_to_string(int i);
 int ioprio_class_from_string(const char *s);