conf-parser: warn when we open configuration files with weird access bits

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

diff --git a/src/shared/path-util.h b/src/shared/path-util.h
index 03f2cf273cdd0e8de63b21560fc21e2d04e66c38..178bed5f175384e595b1cd711c718666fd282310 100644 (file)
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -24,16 +24,19 @@
 #include <stdbool.h>
 
 #include "macro.h"
+#include "time-util.h"
+
+#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
 
 #ifdef HAVE_SPLIT_USR
-#  define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+#  define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
 #else
-#  define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+#  define DEFAULT_PATH DEFAULT_PATH_NORMAL
 #endif
 
 bool is_path(const char *p) _pure_;
 char** path_split_and_make_absolute(const char *p);
-char* path_get_file_name(const char *p) _pure_;
 int path_get_parent(const char *path, char **parent);
 bool path_is_absolute(const char *p) _pure_;
 char* path_make_absolute(const char *p, const char *prefix);
@@ -52,5 +55,14 @@ int path_is_os_tree(const char *path);
 
 int find_binary(const char *name, char **filename);
 
+bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
+
+/* Iterates through the path prefixes of the specified path, going up
+ * the tree, to root. Also returns "" (and not "/"!) for the root
+ * directory. Excludes the specified directory itself */
 #define PATH_FOREACH_PREFIX(prefix, path) \
-        for (char *_slash = strrchr(path_kill_slashes(strcpy(prefix, path)), '/'); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
+        for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); streq(prefix, "/") ? NULL : strrchr(prefix, '/'); }); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
+
+/* Same as PATH_FOREACH_PREFIX but also includes the specified path itself */
+#define PATH_FOREACH_PREFIX_MORE(prefix, path) \
+        for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); if (streq(prefix, "/")) prefix[0] = 0; strrchr(prefix, 0); }); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))