diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-04-18 14:20:49 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
commit | e5e0c80fdfa8861931df799574d5a60c96b6aa13 (patch) | |
tree | 3ff055d308feb83a85c3d8a2edd0eb9ebcfd42a4 /src | |
parent | d1dbf40d47cfa883c4c9fa264dfd84cd57a03b85 (diff) |
util-lib: introduce new empty_or_root() helper (#8746)
We check the same condition at various places. Let's add a trivial,
common helper for this, and use it everywhere.
It's not going to make things much faster or much shorter, but I think a
lot more readable
Diffstat (limited to 'src')
-rw-r--r-- | src/basic/cgroup-util.c | 4 | ||||
-rw-r--r-- | src/basic/fs-util.c | 12 | ||||
-rw-r--r-- | src/basic/path-util.c | 13 | ||||
-rw-r--r-- | src/basic/path-util.h | 4 | ||||
-rw-r--r-- | src/basic/unit-name.c | 2 | ||||
-rw-r--r-- | src/basic/user-util.c | 3 | ||||
-rw-r--r-- | src/core/cgroup.c | 2 | ||||
-rw-r--r-- | src/test/test-path-util.c | 14 |
8 files changed, 38 insertions, 16 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 443d65ff4..1c5ca9899 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -427,7 +427,7 @@ int cg_migrate( * exist in the root cgroup, we only check for * them there. */ if (cfrom && - (isempty(pfrom) || path_equal(pfrom, "/")) && + empty_or_root(pfrom) && is_kernel_thread(pid) > 0) continue; @@ -1202,7 +1202,7 @@ int cg_is_empty_recursive(const char *controller, const char *path) { assert(path); /* The root cgroup is always populated */ - if (controller && (isempty(path) || path_equal(path, "/"))) + if (controller && empty_or_root(path)) return false; r = cg_unified_controller(controller); diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 858441c94..5bf1413c1 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -579,10 +579,6 @@ int inotify_add_watch_fd(int fd, int what, uint32_t mask) { } #endif // 0 -static bool noop_root(const char *root) { - return isempty(root) || path_equal(root, "/"); -} - static bool safe_transition(const struct stat *a, const struct stat *b) { /* Returns true if the transition from a to b is safe, i.e. that we never transition from unprivileged to * privileged files or directories. Why bother? So that unprivileged code can't symlink to privileged files @@ -633,7 +629,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, * specified path. */ /* A root directory of "/" or "" is identical to none */ - if (noop_root(original_root)) + if (empty_or_root(original_root)) original_root = NULL; if (!original_root && !ret && (flags & (CHASE_NONEXISTENT|CHASE_NO_AUTOFS|CHASE_SAFE|CHASE_OPEN)) == CHASE_OPEN) { @@ -718,7 +714,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, /* If we already are at the top, then going up will not change anything. This is in-line with * how the kernel handles this. */ - if (isempty(done) || path_equal(done, "/")) + if (empty_or_root(done)) continue; parent = dirname_malloc(done); @@ -904,7 +900,7 @@ int chase_symlinks_and_open( if (chase_flags & CHASE_NONEXISTENT) return -EINVAL; - if (noop_root(root) && !ret_path && (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE)) == 0) { + if (empty_or_root(root) && !ret_path && (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE)) == 0) { /* Shortcut this call if none of the special features of this call are requested */ r = open(path, open_flags); if (r < 0) @@ -944,7 +940,7 @@ int chase_symlinks_and_opendir( if (chase_flags & CHASE_NONEXISTENT) return -EINVAL; - if (noop_root(root) && !ret_path && (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE)) == 0) { + if (empty_or_root(root) && !ret_path && (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE)) == 0) { /* Shortcut this call if none of the special features of this call are requested */ d = opendir(path); if (!d) diff --git a/src/basic/path-util.c b/src/basic/path-util.c index addd39373..48205dc32 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -646,7 +646,7 @@ char *prefix_root(const char *root, const char *path) { while (path[0] == '/' && path[1] == '/') path++; - if (isempty(root) || path_equal(root, "/")) + if (empty_or_root(root)) return strdup(path); l = strlen(root) + 1 + strlen(path) + 1; @@ -975,3 +975,14 @@ bool dot_or_dot_dot(const char *path) { return path[2] == 0; } + +bool empty_or_root(const char *root) { + + /* For operations relative to some root directory, returns true if the specified root directory is redundant, + * i.e. either / or NULL or the empty string or any equivalent. */ + + if (!root) + return true; + + return root[strspn(root, "/")] == 0; +} diff --git a/src/basic/path-util.h b/src/basic/path-util.h index 08df54573..6583c2c9b 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -121,7 +121,7 @@ char *prefix_root(const char *root, const char *path); size_t _l; \ while (_path[0] == '/' && _path[1] == '/') \ _path ++; \ - if (isempty(_root) || path_equal(_root, "/")) \ + if (empty_or_root(_root)) \ _ret = _path; \ else { \ _l = strlen(_root) + 1 + strlen(_path) + 1; \ @@ -169,3 +169,5 @@ static inline const char *skip_dev_prefix(const char *p) { return e ?: p; } + +bool empty_or_root(const char *root); diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index 02cb86390..85f06126c 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -390,7 +390,7 @@ int unit_name_path_escape(const char *f, char **ret) { path_kill_slashes(p); - if (STR_IN_SET(p, "/", "")) + if (empty_or_root(p)) s = strdup("-"); else { if (!path_is_normalized(p)) diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 55f4908c2..905d34b7f 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -224,8 +224,7 @@ int get_user_creds_clean( (isempty(*shell) || is_nologin_shell(*shell))) *shell = NULL; - if (home && - (isempty(*home) || path_equal(*home, "/"))) + if (home && empty_or_root(*home)) *home = NULL; return 0; diff --git a/src/core/cgroup.c b/src/core/cgroup.c index c52bdbf15..9b69fa82e 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -40,7 +40,7 @@ bool manager_owns_root_cgroup(Manager *m) { if (detect_container() > 0) return false; - return isempty(m->cgroup_root) || path_equal(m->cgroup_root, "/"); + return empty_or_root(m->cgroup_root); } #if 0 /// UNNEEDED by elogind diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index f7e96283f..e7a247027 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -478,6 +478,19 @@ static void test_skip_dev_prefix(void) { assert_se(streq(skip_dev_prefix("foo"), "foo")); } +static void test_empty_or_root(void) { + assert_se(empty_or_root(NULL)); + assert_se(empty_or_root("")); + assert_se(empty_or_root("/")); + assert_se(empty_or_root("//")); + assert_se(empty_or_root("///")); + assert_se(empty_or_root("/////////////////")); + assert_se(!empty_or_root("xxx")); + assert_se(!empty_or_root("/xxx")); + assert_se(!empty_or_root("/xxx/")); + assert_se(!empty_or_root("//yy//")); +} + int main(int argc, char **argv) { log_set_max_level(LOG_DEBUG); log_parse_environment(); @@ -500,6 +513,7 @@ int main(int argc, char **argv) { test_filename_is_valid(); test_hidden_or_backup_file(); test_skip_dev_prefix(); + test_empty_or_root(); #if 0 /// UNNEEDED by elogind test_systemd_installation_has_version(argv[1]); /* NULL is OK */ |