X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsysctl%2Fsysctl.c;h=809e59b71fdb6acd8a184e2f52a5fca7d2c092ce;hb=74a550c5d8228e58b936dd70e183f633bf373632;hp=79f3f77676c81efdf3cc584123d9131e23402d0d;hpb=6f6fad96addf6b00b55c98cc0d0d8026b0c1e7ca;p=elogind.git diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index 79f3f7767..809e59b71 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -30,11 +30,11 @@ #include "log.h" #include "strv.h" #include "util.h" -#include "strv.h" #include "hashmap.h" #include "path-util.h" #include "conf-files.h" #include "fileio.h" +#include "build.h" static char **arg_prefixes = NULL; @@ -48,12 +48,26 @@ static const char conf_file_dirs[] = #endif ; -static char *normalize_sysctl(char *s) { +static char* normalize_sysctl(char *s) { char *n; - for (n = s; *n; 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, "/."); + } return s; } @@ -65,7 +79,7 @@ static int apply_sysctl(const char *property, const char *value) { log_debug("Setting '%s' to '%s'", property, value); - p = new(char, sizeof("/proc/sys/") + strlen(property)); + p = new(char, strlen("/proc/sys/") + strlen(property) + 1); if (!p) return log_oom(); @@ -88,7 +102,7 @@ static int apply_sysctl(const char *property, const char *value) { } } - k = write_one_line_file(p, value); + k = write_string_file(p, value); if (k < 0) { log_full(k == -ENOENT ? LOG_DEBUG : LOG_WARNING, "Failed to write '%s' to '%s': %s", value, p, strerror(-k)); @@ -123,7 +137,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno assert(path); - r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f); + r = search_and_fopen_nulstr(path, "re", NULL, conf_file_dirs, &f); if (r < 0) { if (ignore_enoent && r == -ENOENT) return 0; @@ -132,9 +146,10 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno return r; } - log_debug("parse: %s\n", path); + log_debug("parse: %s", path); while (!feof(f)) { char l[LINE_MAX], *p, *value, *new_value, *property, *existing; + void *v; int k; if (!fgets(l, sizeof(l), f)) { @@ -149,7 +164,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno if (!*p) continue; - if (strchr(COMMENTS, *p)) + if (strchr(COMMENTS "\n", *p)) continue; value = strchr(p, '='); @@ -167,13 +182,14 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno p = normalize_sysctl(strstrip(p)); value = strstrip(value); - existing = hashmap_get(sysctl_options, p); + existing = hashmap_get2(sysctl_options, p, &v); if (existing) { - if (!streq(value, existing)) - log_warning("Duplicate assignment of %s in file '%s', ignoring.", - p, path); + if (streq(value, existing)) + continue; - continue; + log_info("Overwriting earlier assignment of %s in file '%s'.", p, path); + free(hashmap_remove(sysctl_options, p)); + free(v); } property = strdup(p); @@ -188,7 +204,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno k = hashmap_put(sysctl_options, property, new_value); if (k < 0) { - log_error("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-r)); + log_error("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-k)); free(property); free(new_value); return k; @@ -198,27 +214,27 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno return r; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" "Applies kernel sysctl settings.\n\n" " -h --help Show this help\n" - " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", - program_invocation_short_name); - - return 0; + " --version Show package version\n" + " --prefix=PATH Only apply rules with the specified prefix\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { enum { + ARG_VERSION = 0x100, ARG_PREFIX }; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, { "prefix", required_argument, NULL, ARG_PREFIX }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -226,7 +242,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) switch (c) { @@ -234,20 +250,28 @@ static int parse_argv(int argc, char *argv[]) { help(); return 0; + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); + return 0; + case ARG_PREFIX: { char *p; - char **l; - - for (p = optarg; *p; p++) - if (*p == '.') - *p = '/'; - l = strv_append(arg_prefixes, optarg); - if (!l) + /* We used to require people to specify absolute paths + * in /proc/sys in the past. This is kinda useless, but + * we need to keep compatibility. We now support any + * sysctl name available. */ + normalize_sysctl(optarg); + if (startswith(optarg, "/proc/sys")) + p = strdup(optarg); + else + p = strappend("/proc/sys/", optarg); + + if (!p) + return log_oom(); + if (strv_consume(&arg_prefixes, p) < 0) return log_oom(); - - strv_free(arg_prefixes); - arg_prefixes = l; break; } @@ -256,10 +280,8 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } - } return 1; } @@ -278,7 +300,7 @@ int main(int argc, char *argv[]) { umask(0022); - sysctl_options = hashmap_new(string_hash_func, string_compare_func); + sysctl_options = hashmap_new(&string_hash_ops); if (!sysctl_options) { r = log_oom(); goto finish; @@ -304,8 +326,6 @@ int main(int argc, char *argv[]) { goto finish; } - r = parse_file(sysctl_options, "/etc/sysctl.conf", true); - STRV_FOREACH(f, files) { k = parse_file(sysctl_options, *f, true); if (k < 0 && r == 0)