X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=11d28665b6ba5144d5b81fae22124ace9e1ceda5;hb=9d9951a460a90ef0e1e0384742cefdcf85193f8c;hp=e4300719a3b12a83cdb9b2e514572f788a18cb5f;hpb=1c231f56482546725c4dbd3303f70300bd3c63e9;p=elogind.git diff --git a/src/shared/util.h b/src/shared/util.h index e4300719a..11d28665b 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -451,6 +451,8 @@ static inline const char *ansi_highlight_off(void) { return on_tty() ? ANSI_HIGHLIGHT_OFF : ""; } +int files_same(const char *filea, const char *fileb); + int running_in_chroot(void); char *ellipsize(const char *s, size_t length, unsigned percent); @@ -481,7 +483,7 @@ bool tty_is_console(const char *tty) _pure_; int vtnr_from_tty(const char *tty); const char *default_term_for_tty(const char *tty); -void execute_directory(const char *directory, DIR *_d, char *argv[]); +void execute_directory(const char *directory, DIR *_d, usec_t timeout, char *argv[]); int kill_and_sigcont(pid_t pid, int sig); @@ -869,7 +871,7 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, } int proc_cmdline(char **ret); -int parse_proc_cmdline(int (*parse_word)(const char *word)); +int parse_proc_cmdline(int (*parse_word)(const char *key, const char *value)); int container_get_leader(const char *machine, pid_t *pid); @@ -893,3 +895,5 @@ unsigned long personality_from_string(const char *p); const char *personality_to_string(unsigned long); uint64_t physical_memory(void); + +char* mount_test_option(const char *haystack, const char *needle);