X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsysctl%2Fsysctl.c;h=275a5b74aee4669c22cf8a4eebff42b83fb1f4a7;hb=b762fbd128480426d225596b18604a45042339c5;hp=8868732ad1352230fbb2e5ff1b4c9d2cd4ef8202;hpb=4cf7ea556aa1e74f9b34d4467f36d46a1bb25da3;p=elogind.git diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index 8868732ad..275a5b74a 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -38,22 +38,28 @@ static char **arg_prefixes = NULL; -static const char conf_file_dirs[] = - "/etc/sysctl.d\0" - "/run/sysctl.d\0" - "/usr/local/lib/sysctl.d\0" - "/usr/lib/sysctl.d\0" -#ifdef HAVE_SPLIT_USR - "/lib/sysctl.d\0" -#endif - ; - -static char *normalize_sysctl(char *s) { +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("sysctl"); + +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,29 +71,13 @@ 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(); n = stpcpy(p, "/proc/sys/"); strcpy(n, property); - if (!strv_isempty(arg_prefixes)) { - char **i; - bool good = false; - - STRV_FOREACH(i, arg_prefixes) - if (path_startswith(p, *i)) { - good = true; - break; - } - - if (!good) { - log_debug("Skipping %s", p); - return 0; - } - } - k = write_string_file(p, value); if (k < 0) { log_full(k == -ENOENT ? LOG_DEBUG : LOG_WARNING, @@ -128,8 +118,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno if (ignore_enoent && r == -ENOENT) return 0; - log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r)); - return r; + return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path); } log_debug("parse: %s", path); @@ -142,7 +131,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno if (feof(f)) break; - log_error("Failed to read file '%s', ignoring: %m", path); + log_error_errno(errno, "Failed to read file '%s', ignoring: %m", path); return -errno; } @@ -168,6 +157,20 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno p = normalize_sysctl(strstrip(p)); value = strstrip(value); + if (!strv_isempty(arg_prefixes)) { + char **i, *t; + STRV_FOREACH(i, arg_prefixes) { + t = path_startswith(*i, "/proc/sys/"); + if (t == NULL) + t = *i; + if (path_startswith(p, t)) + goto found; + } + /* not found */ + continue; + } + +found: existing = hashmap_get2(sysctl_options, p, &v); if (existing) { if (streq(value, existing)) @@ -190,7 +193,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(-k)); + log_error_errno(k, "Failed to add sysctl variable %s to hashmap: %m", property); free(property); free(new_value); return k; @@ -200,16 +203,13 @@ 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" " --version Show package version\n" - " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", - program_invocation_short_name); - - return 0; + " --prefix=PATH Only apply rules with the specified prefix\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -231,12 +231,13 @@ 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) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -246,11 +247,19 @@ static int parse_argv(int argc, char *argv[]) { case ARG_PREFIX: { char *p; - for (p = optarg; *p; p++) - if (*p == '.') - *p = '/'; - - if (strv_extend(&arg_prefixes, optarg) < 0) + /* 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(); break; @@ -262,7 +271,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; } @@ -281,7 +289,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; @@ -303,7 +311,7 @@ int main(int argc, char *argv[]) { r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); if (r < 0) { - log_error("Failed to enumerate sysctl.d files: %s", strerror(-r)); + log_error_errno(r, "Failed to enumerate sysctl.d files: %m"); goto finish; }