chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: extra protection against dbus calling into us while we are already disconnected
[elogind.git]
/
util.h
diff --git
a/util.h
b/util.h
index 9f9bca86f2c44df00401069854b362e5408d0a67..30a0616d542060d8c98aa3028c0eab95a914d727 100644
(file)
--- 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"
/* What is interpreted as whitespace? */
#define WHITESPACE " \t\n\r"
+#define NEWLINE "\n\r"
usec_t now(clockid_t clock);
usec_t now(clockid_t clock);
@@
-129,9
+130,14
@@
char **strv_path_make_absolute_cwd(char **l);
int reset_all_signal_handlers(void);
char *strstrip(char *s);
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);
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);
char hexchar(int x);
int unhexchar(char c);
char octchar(int x);
@@
-155,6
+161,8
@@
char *bus_path_unescape(const char *s);
bool ignore_file(const char *filename);
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)) \
#define DEFINE_STRING_TABLE_LOOKUP(name,type) \
const char *name##_to_string(type i) { \
if (i < 0 || i >= (type) ELEMENTSOF(name##_table)) \
@@
-163,15
+171,26
@@
bool ignore_file(const char *filename);
} \
type name##_from_string(const char *s) { \
type i; \
} \
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; \
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__
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);
const char *ioprio_class_to_string(int i);
int ioprio_class_from_string(const char *s);