util: add files_same() helper function

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index 78b1444739227d6e27db1930e03b5aba8edba89f..11d28665b6ba5144d5b81fae22124ace9e1ceda5 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -58,6 +58,14 @@
 #  error Unknown uid_t size
 #endif
 
 #  error Unknown uid_t size
 #endif
 

+#if SIZEOF_GID_T == 4
+#  define GID_FMT "%" PRIu32
+#elif SIZEOF_GID_T == 2
+#  define GID_FMT "%" PRIu16
+#else
+#  error Unknown gid_t size
+#endif
+

 #include "macro.h"
 #include "time-util.h"
 
 #include "macro.h"
 #include "time-util.h"
 


@@ -443,6 +451,8 @@ static inline const char *ansi_highlight_off(void) {
         return on_tty() ? ANSI_HIGHLIGHT_OFF : "";
 }
 
         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);
 int running_in_chroot(void);
 
 char *ellipsize(const char *s, size_t length, unsigned percent);


@@ -473,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);
 
 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);
 
 
 int kill_and_sigcont(pid_t pid, int sig);
 


@@ -861,7 +871,7 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size,
 }
 
 int proc_cmdline(char **ret);
 }
 
 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);
 
 
 int container_get_leader(const char *machine, pid_t *pid);
 


@@ -883,3 +893,7 @@ int fd_warn_permissions(const char *path, int fd);
 
 unsigned long personality_from_string(const char *p);
 const char *personality_to_string(unsigned long);
 
 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);