main: when ignoring a signal set SA_RESTART

[elogind.git] / util.h

diff --git a/util.h b/util.h
index 9f9bca86f2c44df00401069854b362e5408d0a67..6728eb143a2cc4b2777e846a08cf0123c8f27c88 100644 (file)
--- a/util.h
+++ b/util.h
@@ -27,6 +27,7 @@
 #include <sys/time.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 typedef uint64_t usec_t;
 
@@ -39,6 +40,9 @@ typedef uint64_t usec_t;
 
 /* What is interpreted as whitespace? */
 #define WHITESPACE " \t\n\r"
+#define NEWLINE "\n\r"
+
+#define FORMAT_TIMESTAMP_MAX 64
 
 usec_t now(clockid_t clock);
 
@@ -50,6 +54,8 @@ struct timeval *timeval_store(struct timeval *tv, usec_t u);
 
 #define streq(a,b) (strcmp((a),(b)) == 0)
 
+bool streq_ptr(const char *a, const char *b);
+
 #define new(t, n) ((t*) malloc(sizeof(t)*(n)))
 
 #define new0(t, n) ((t*) calloc((n), sizeof(t)))
@@ -129,8 +135,14 @@ 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 mkdir_p(const char *path, mode_t mode);
+
+int get_process_name(pid_t pid, char **name);
 
 char hexchar(int x);
 int unhexchar(char c);
@@ -155,6 +167,10 @@ char *bus_path_unescape(const char *s);
 
 bool ignore_file(const char *filename);
 
+bool chars_intersect(const char *a, const char *b);
+
+char *format_timestamp(char *buf, size_t l, usec_t t);
+
 #define DEFINE_STRING_TABLE_LOOKUP(name,type)                           \
         const char *name##_to_string(type i) {                          \
                 if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
@@ -163,15 +179,42 @@ bool ignore_file(const char *filename);
         }                                                               \
         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);
+
+bool fstype_is_network(const char *fstype);
+
+int chvt(int vt);
+
+int read_one_char(FILE *f, char *ret, bool *need_nl);
+int ask(char *ret, const char *replies, const char *text, ...);
+
+int reset_terminal(int fd);
+int open_terminal(const char *name, int mode);
+int acquire_terminal(const char *name, bool fail, bool force);
+int release_terminal(void);
+
+int flush_fd(int fd);
+
+int ignore_signal(int sig);
+
+extern char * __progname;
+
 const char *ioprio_class_to_string(int i);
 int ioprio_class_from_string(const char *s);