chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id-setup: `--print --commit` respects the --root option
[elogind.git]
/
src
/
basic
/
path-util.h
diff --git
a/src/basic/path-util.h
b/src/basic/path-util.h
index cdb194d2a34bb3a02e7ae6b4984be6c394e37726..6c906e54a13000e62f3c1a24809dba498ad9c157 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 <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"
#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
})
#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
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);
#if 0 /// UNNEEDED by elogind
int find_binary(const char *name, char **filename);
@@
-140,7
+153,7
@@
bool hidden_or_backup_file(const char *filename) _pure_;
#if 0 /// UNNEEDED by elogind
bool is_device_path(const char *path);
#if 0 /// UNNEEDED by elogind
bool is_device_path(const char *path);
-#endif // 0
bool is_deviceallow_pattern(const char *path);
int systemd_installation_has_version(const char *root, unsigned minimal_version);
bool is_deviceallow_pattern(const char *path);
int systemd_installation_has_version(const char *root, unsigned minimal_version);
+#endif // 0