add basic (and not very useful) D-Bus support

[elogind.git] / util.h

diff --git a/util.h b/util.h
index 3e86b29863e88d12d9f38d5c54d9329add353441..bdbaa36e13b0719756c0a98f92d4ce3edf5ebbb6 100644 (file)
--- a/util.h
+++ b/util.h
@@ -19,7 +19,7 @@ typedef uint64_t usec_t;
 #define NSEC_PER_USEC 1000ULL
 
 /* What is interpreted as whitespace? */
-#define WHITESPACE " \t\n"
+#define WHITESPACE " \t\n\r"
 
 usec_t now(clockid_t clock);
 
@@ -60,7 +60,10 @@ static inline bool is_path_absolute(const char *p) {
 bool endswith(const char *s, const char *postfix);
 bool startswith(const char *s, const char *prefix);
 
+bool first_word(const char *s, const char *word);
+
 int close_nointr(int fd);
+void close_nointr_nofail(int fd);
 
 int parse_boolean(const char *v);
 
@@ -82,8 +85,6 @@ char *split_quoted(const char *c, size_t *l, char **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)))
 
-const char *sigchld_code(int code);
-
 pid_t get_parent_of_pid(pid_t pid, pid_t *ppid);
 
 int write_one_line_file(const char *fn, const char *line);
@@ -91,4 +92,71 @@ int read_one_line_file(const char *fn, char **line);
 
 char *strappend(const char *s, const char *suffix);
 
+int readlink_malloc(const char *p, char **r);
+
+char *file_name_from_path(const char *p);
+bool is_path(const char *p);
+
+bool path_is_absolute(const char *p);
+char *path_make_absolute(const char *p, const char *prefix);
+
+int reset_all_signal_handlers(void);
+
+char *strstrip(char *s);
+char *file_in_same_dir(const char *path, const char *filename);
+
+char hexchar(int x);
+int unhexchar(char c);
+char octchar(int x);
+int unoctchar(char c);
+
+char *cescape(const char *s);
+char *cunescape(const char *s);
+
+char *path_kill_slashes(char *path);
+
+bool path_startswith(const char *path, const char *prefix);
+
+char *ascii_strlower(char *path);
+
+char *xescape(const char *s, const char *bad);
+
+char *bus_path_escape(const char *s);
+char *bus_path_unescape(const char *s);
+
+#define DEFINE_STRING_TABLE_LOOKUP(name,type)                           \
+        const char *name##_to_string(type i) {                          \
+                if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
+                        return NULL;                                    \
+                return name##_table[i];                                 \
+        }                                                               \
+        type name##_from_string(const char *s) {                        \
+                type i;                                                 \
+                assert(s);                                              \
+                for (i = 0; i < (type)ELEMENTSOF(name##_table); i++)    \
+                        if (streq(name##_table[i], s))                  \
+                                return i;                               \
+                return (type) -1;                                       \
+        }                                                               \
+        struct __useless_struct_to_allow_trailing_semicolon__
+
+
+const char *ioprio_class_to_string(int i);
+int ioprio_class_from_string(const char *s);
+
+const char *sigchld_code_to_string(int i);
+int sigchld_code_from_string(const char *s);
+
+const char *log_facility_to_string(int i);
+int log_facility_from_string(const char *s);
+
+const char *log_level_to_string(int i);
+int log_level_from_string(const char *s);
+
+const char *sched_policy_to_string(int i);
+int sched_policy_from_string(const char *s);
+
+const char *rlimit_to_string(int i);
+int rlimit_from_string(const char *s);
+
 #endif