X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futil.h;h=6a252abbb153f727d7197d178217304030a3f7ad;hp=ae00ff50c43c901a41af89d91ad000066cfe46ba;hb=ec863ba65a41e58680a3ab15841243088284e808;hpb=b0c918b97f1abb160d8df2b94deb03efcb4fcf8f diff --git a/src/util.h b/src/util.h index ae00ff50c..6a252abbb 100644 --- a/src/util.h +++ b/src/util.h @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "macro.h" @@ -82,6 +84,7 @@ usec_t timeval_load(const struct timeval *tv); struct timeval *timeval_store(struct timeval *tv, usec_t u); #define streq(a,b) (strcmp((a),(b)) == 0) +#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0) bool streq_ptr(const char *a, const char *b); @@ -191,7 +194,7 @@ int write_one_line_file(const char *fn, const char *line); int read_one_line_file(const char *fn, char **line); int read_full_file(const char *fn, char **contents); -int parse_env_file(const char *fname, const char *seperator, ...) _sentinel_; +int parse_env_file(const char *fname, const char *separator, ...) _sentinel_; char *strappend(const char *s, const char *suffix); char *strnappend(const char *s, const char *suffix, size_t length); @@ -355,6 +358,14 @@ char *unquote(const char *s, const char *quotes); int wait_for_terminate(pid_t pid, siginfo_t *status); int wait_for_terminate_and_warn(const char *name, pid_t pid); +_noreturn_ void freeze(void); + +bool null_or_empty(struct stat *st); + +DIR *xopendirat(int dirfd, const char *name); + +int ask_password_tty(const char *message, usec_t until, const char *flag_file, char **_passphrase); + #define NULSTR_FOREACH(i, l) \ for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1) @@ -382,4 +393,6 @@ int ip_tos_from_string(const char *s); const char *signal_to_string(int i); int signal_from_string(const char *s); +int signal_from_string_try_harder(const char *s); + #endif