diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:37:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:37:33 -0400 |
| commit | f6e7ffdf3fe8e3ed5e659f747946461350ade5a8 (patch) | |
| tree | d261964cafdd51154b1ad757574f508da2d9ad76 /src/basic/path-util.h | |
| parent | 566cac15ed36506e2bb766313a5d4e0825bc6499 (diff) | |
| parent | 022ed72eff07ca6c1409747e774ef5b35724c9df (diff) | |
Merge tag 'v230-3.parabola1' into parabola
Diffstat (limited to 'src/basic/path-util.h')
| -rw-r--r-- | src/basic/path-util.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/basic/path-util.h b/src/basic/path-util.h index 2c2f87a9f2..a27c13fcc3 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -48,6 +48,23 @@ bool path_equal(const char *a, const char *b) _pure_; bool path_equal_or_files_same(const char *a, const char *b); char* path_join(const char *root, const char *path, const char *rest); +static inline bool path_equal_ptr(const char *a, const char *b) { + return !!a == !!b && (!a || path_equal(a, b)); +} + +/* Note: the search terminates on the first NULL item. */ +#define PATH_IN_SET(p, ...) \ + ({ \ + char **s; \ + bool _found = false; \ + STRV_FOREACH(s, STRV_MAKE(__VA_ARGS__)) \ + if (path_equal(p, *s)) { \ + _found = true; \ + break; \ + } \ + _found; \ + }) + int path_strv_make_absolute_cwd(char **l); char** path_strv_resolve(char **l, const char *prefix); char** path_strv_resolve_uniq(char **l, const char *prefix); @@ -105,7 +122,6 @@ bool path_is_safe(const char *p) _pure_; char *file_in_same_dir(const char *path, const char *filename); -bool hidden_file_allow_backup(const char *filename); -bool hidden_file(const char *filename) _pure_; +bool hidden_or_backup_file(const char *filename) _pure_; bool is_device_path(const char *path); |