SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: properly handle the root dir in PATH_FOREACH_PREFIX

Browse Source 
Also add PATH_FOREACH_PREFIX_MORE which includes the specified dir
itself in the iteration
This commit is contained in:
Lennart Poettering
2013-09-26 20:20:30 +02:00
parent baa89da40a
commit e203f7c3ad
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/path-util.h
+8 -1
View File
@@ -52,5 +52,12 @@ int path_is_os_tree(const char *path);
int find_binary(const char *name, char **filename);
/* 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), '/'))