summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-09-25 20:58:23 +0200
committerLennart Poettering <lennart@poettering.net>2013-09-25 21:04:35 +0200
commitfecffe5d0a1bd66d80e5a8728ff8a89673be0df7 (patch)
tree133a9f9b0dc791723a1e63fa6efb5fafa4a8ba60 /src
parentbc5fb0809e6f5784888f30057708548f14dcb459 (diff)
util: add macro for iterating through all prefixes of a path
Syntactic sugar in a macro PATH_FOREACH_PREFIX.
Diffstat (limited to 'src')
-rw-r--r--src/shared/cgroup-util.c26
-rw-r--r--src/shared/path-util.h3
-rw-r--r--src/test/test-path-util.c27
3 files changed, 34 insertions, 22 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index 2e630d470..dc0fe85ee 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -456,23 +456,14 @@ int cg_migrate_recursive_fallback(
/* This didn't work? Then let's try all prefixes of the destination */
- strcpy(prefix, pto);
- for (;;) {
- char *slash;
-
- slash = strrchr(prefix, '/');
- if (!slash)
- break;
-
- *slash = 0;
-
+ PATH_FOREACH_PREFIX(prefix, pto) {
r = cg_migrate_recursive(cfrom, pfrom, cto, prefix, ignore_self, rem);
if (r >= 0)
break;
}
}
- return r;
+ return 0;
}
static const char *normalize_controller(const char *controller) {
@@ -661,23 +652,14 @@ int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
/* This didn't work? Then let's try all prefixes of
* the destination */
- strcpy(prefix, path);
- for (;;) {
- char *slash;
-
- slash = strrchr(prefix, '/');
- if (!slash)
- break;
-
- *slash = 0;
-
+ PATH_FOREACH_PREFIX(prefix, path) {
r = cg_attach(controller, prefix, pid);
if (r >= 0)
break;
}
}
- return r;
+ return 0;
}
int cg_set_group_access(
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
index 945293158..03f2cf273 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -51,3 +51,6 @@ int path_is_read_only_fs(const char *path);
int path_is_os_tree(const char *path);
int find_binary(const char *name, char **filename);
+
+#define PATH_FOREACH_PREFIX(prefix, path) \
+ for (char *_slash = strrchr(path_kill_slashes(strcpy(prefix, path)), '/'); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index b0aeb11a6..e303e488e 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -106,8 +106,35 @@ static void test_find_binary(void) {
assert(find_binary("xxxx-xxxx", &p) == -ENOENT);
}
+static void test_prefixes(void) {
+ static const char* values[] = { "/a/b/c", "/a/b", "/a", "", NULL};
+ unsigned i = 0;
+ char s[PATH_MAX];
+
+ PATH_FOREACH_PREFIX(s, "/a/b/c/d") {
+ log_error("---%s---", s);
+ assert_se(streq(s, values[i++]));
+ }
+
+ assert_se(values[i] == NULL);
+
+ i = 0;
+ PATH_FOREACH_PREFIX(s, "////a////b////c///d///////")
+ assert_se(streq(s, values[i++]));
+
+ assert_se(values[i] == NULL);
+
+ PATH_FOREACH_PREFIX(s, "////")
+ assert_se(streq(s, ""));
+
+ PATH_FOREACH_PREFIX(s, "")
+ assert_not_reached("wut?");
+
+}
+
int main(void) {
test_path();
test_find_binary();
+ test_prefixes();
return 0;
}