Prep v233: Unmask now needed functions in src/basic

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

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 605485665d2962f9652ff9c7828143ded583be01..3e1519efe4f5629d37e2e2fc9d109f5af3d14352 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -24,6 +24,7 @@
 #include <stddef.h>
 
 #include "macro.h"
+#include "string-util.h"
 #include "time-util.h"
 
 #define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
@@ -74,10 +75,22 @@ static inline bool path_equal_ptr(const char *a, const char *b) {
         })
 
 #if 0 /// UNNEEDED by elogind
+#define PATH_STARTSWITH_SET(p, ...)                             \
+        ({                                                      \
+                char **s;                                       \
+                bool _found = false;                            \
+                STRV_FOREACH(s, STRV_MAKE(__VA_ARGS__))         \
+                        if (path_startswith(p, *s)) {           \
+                               _found = true;                   \
+                               break;                           \
+                        }                                       \
+                _found;                                         \
+        })
+
 int path_strv_make_absolute_cwd(char **l);
 #endif // 0
-char** path_strv_resolve(char **l, const char *prefix);
-char** path_strv_resolve_uniq(char **l, const char *prefix);
+char** path_strv_resolve(char **l, const char *root);
+char** path_strv_resolve_uniq(char **l, const char *root);
 
 #if 0 /// UNNEEDED by elogind
 int find_binary(const char *name, char **filename);
@@ -144,3 +157,5 @@ bool is_deviceallow_pattern(const char *path);
 
 int systemd_installation_has_version(const char *root, unsigned minimal_version);
 #endif // 0
+
+bool dot_or_dot_dot(const char *path);