sysctl: move property handling to shared/

diff --git a/Makefile.am b/Makefile.am
index 3539e03c5e36b2222ab9cd97313bef271401db38..89a8019b0f1661f3956349c38ae8bf760db26f3b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -908,7 +908,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sigbus.h \
        src/shared/build.h \
        src/shared/import-util.c \
-       src/shared/import-util.h
+       src/shared/import-util.h \
+       src/shared/sysctl-util.c \
+       src/shared/sysctl-util.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \

diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
new file mode 100644 (file)
index 0000000..650c9c9
--- /dev/null
+++ b/src/shared/sysctl-util.c
@@ -0,0 +1,88 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <limits.h>
+#include <getopt.h>
+
+#include "log.h"
+#include "util.h"
+#include "fileio.h"
+#include "build.h"
+#include "sysctl-util.h"
+
+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, "/.");
+        }
+
+        return s;
+}
+
+int sysctl_write(const char *property, const char *value) {
+        _cleanup_free_ char *p = NULL;
+        char *n;
+
+        log_debug("Setting '%s' to '%s'", property, value);
+
+        p = new(char, strlen("/proc/sys/") + strlen(property) + 1);
+        if (!p)
+                return log_oom();
+
+        n = stpcpy(p, "/proc/sys/");
+        strcpy(n, property);
+
+        return write_string_file(p, value);
+}
+
+int sysctl_read(const char *property, char **content) {
+        _cleanup_free_ char *p = NULL;
+        char *n;
+
+        p = new(char, strlen("/proc/sys/") + strlen(property) + 1);
+        if (!p)
+                return log_oom();
+
+        n = stpcpy(p, "/proc/sys/");
+        strcpy(n, property);
+
+        return read_full_file(p, content, NULL);
+}

diff --git a/src/shared/sysctl-util.h b/src/shared/sysctl-util.h
new file mode 100644 (file)
index 0000000..2ee6454
--- /dev/null
+++ b/src/shared/sysctl-util.h
@@ -0,0 +1,27 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2011 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+char *sysctl_normalize(char *s);
+int sysctl_read(const char *property, char **value);
+int sysctl_write(const char *property, const char *value);
+

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 2415d84526111db42abbf808f6a2091fc19bf6d7..dd2e118737920429b79e5658c1fc9a42fe6c927a 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -35,61 +35,12 @@
 #include "conf-files.h"
 #include "fileio.h"
 #include "build.h"
+#include "sysctl-util.h"
 
 static char **arg_prefixes = NULL;
 
 static const char conf_file_dirs[] = CONF_DIRS_NULSTR("sysctl");
 
-static char* normalize_sysctl(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, "/.");
-        }
-
-        return s;
-}
-
-static int apply_sysctl(const char *property, const char *value) {
-        _cleanup_free_ char *p = NULL;
-        char *n;
-        int r = 0, k;
-
-        log_debug("Setting '%s' to '%s'", property, value);
-
-        p = new(char, strlen("/proc/sys/") + strlen(property) + 1);
-        if (!p)
-                return log_oom();
-
-        n = stpcpy(p, "/proc/sys/");
-        strcpy(n, property);
-
-        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));
-
-                if (k != -ENOENT && r == 0)
-                        r = k;
-        }
-
-        return r;
-}
-
 static int apply_all(Hashmap *sysctl_options) {
         int r = 0;
         char *property, *value;
@@ -100,9 +51,14 @@ static int apply_all(Hashmap *sysctl_options) {
         HASHMAP_FOREACH_KEY(value, property, sysctl_options, i) {
                 int k;
 
-                k = apply_sysctl(property, value);
-                if (k < 0 && r == 0)
-                        r = k;
+                k = sysctl_write(property, value);
+                if (k < 0) {
+                        log_full(k == -ENOENT ? LOG_DEBUG : LOG_WARNING,
+                                 "Failed to write '%s' to '%s': %s", value, property, strerror(-k));
+
+                        if (r == 0)
+                                r = k;
+                }
         }
         return r;
 }
@@ -154,7 +110,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
                 *value = 0;
                 value++;
 
-                p = normalize_sysctl(strstrip(p));
+                p = sysctl_normalize(strstrip(p));
                 value = strstrip(value);
 
                 if (!strv_isempty(arg_prefixes)) {
@@ -251,7 +207,7 @@ static int parse_argv(int argc, char *argv[]) {
                          * 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);
+                        sysctl_normalize(optarg);
                         if (startswith(optarg, "/proc/sys"))
                                 p = strdup(optarg);
                         else