diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-01-16 15:53:57 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-02-05 17:35:59 +0100 |
commit | a827c41851d9a065823c9fa444944952c11969ac (patch) | |
tree | 8dc4dcc3c4442532a149195d98e7190e851eb030 | |
parent | fb1bfd6804042799dc163063dc015947a1d515e8 (diff) | |
download | systemd-a827c41851d9a065823c9fa444944952c11969ac.tar.gz |
shared/sysctl-util: normalize repeated slashes or dots to a single value
We use those strings as hash keys. While writing "a...b" looks strange,
"a///b" does not look so strange. Both syntaxes would actually result in the
value being correctly written to the file, but they would confuse our
de-deplication over keys. So let's normalize. Output also becomes nicer.
Add test.
(cherry picked from commit f3b136a4847a0993e2dc1197779160dca4da6dac)
(cherry picked from commit c2e304681929fea79ce8e9c5a1e00cd2f293a72d)
-rw-r--r-- | src/shared/sysctl-util.c | 32 | ||||
-rw-r--r-- | src/test/meson.build | 4 | ||||
-rw-r--r-- | src/test/test-sysctl-util.c | 44 |
3 files changed, 67 insertions, 13 deletions
diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c index 93bdcf11bf..1435487099 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c @@ -10,6 +10,7 @@ #include "fileio.h" #include "log.h" #include "macro.h" +#include "path-util.h" #include "string-util.h" #include "sysctl-util.h" @@ -17,22 +18,27 @@ char *sysctl_normalize(char *s) { char *n; n = strpbrk(s, "/."); + /* If the first separator is a slash, the path is * assumed to be normalized and slashes remain slashes * and dots remains dots. */ - if (!n || *n == '/') - return s; - - /* Otherwise, dots become slashes and slashes become - * dots. Fun. */ - while (n) { - if (*n == '.') - *n = '/'; - else - *n = '.'; - - n = strpbrk(n + 1, "/."); - } + + if (n && *n == '.') + /* Dots become slashes and slashes become dots. Fun. */ + do { + if (*n == '.') + *n = '/'; + else + *n = '.'; + + n = strpbrk(n + 1, "/."); + } while (n); + + path_simplify(s, true); + + /* Kill the leading slash, but keep the first character of the string in the same place. */ + if (*s == '/' && *(s+1)) + memmove(s, s+1, strlen(s)); return s; } diff --git a/src/test/meson.build b/src/test/meson.build index de31e977bc..dcebbb6155 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -329,6 +329,10 @@ tests += [ [], []], + [['src/test/test-sysctl-util.c'], + [], + []], + [['src/test/test-user-util.c'], [], []], diff --git a/src/test/test-sysctl-util.c b/src/test/test-sysctl-util.c new file mode 100644 index 0000000000..2b957dd4d6 --- /dev/null +++ b/src/test/test-sysctl-util.c @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ + +#include "strv.h" +#include "sysctl-util.h" +#include "tests.h" + +static const char* cases[] = { + "a.b.c", "a/b/c", + "a/b/c", "a/b/c", + "a/b.c/d", "a/b.c/d", + "a.b/c.d", "a/b.c/d", + + "net.ipv4.conf.enp3s0/200.forwarding", "net/ipv4/conf/enp3s0.200/forwarding", + "net/ipv4/conf/enp3s0.200/forwarding", "net/ipv4/conf/enp3s0.200/forwarding", + + "a...b...c", "a/b/c", + "a///b///c", "a/b/c", + ".a...b...c", "a/b/c", + "/a///b///c", "a/b/c", + NULL, +}; + +static void test_sysctl_normalize(void) { + log_info("/* %s */", __func__); + + const char **s, **expected; + STRV_FOREACH_PAIR(s, expected, cases) { + _cleanup_free_ char *t; + + assert_se(t = strdup(*s)); + assert_se(sysctl_normalize(t) == t); + + log_info("\"%s\" → \"%s\", expected \"%s\"", *s, t, *expected); + assert_se(streq(t, *expected)); + } +} + +int main(int argc, char *argv[]) { + test_setup_logging(LOG_INFO); + + test_sysctl_normalize(); + + return 0; +} |