SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysctl: move property handling to shared/

Browse Source
This commit is contained in:
Kay Sievers
2015-03-11 10:37:45 +01:00
parent c6ac7e4b98
commit 88a60da054
4 changed files with 129 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysctl/sysctl.c
+11 -55
View File
@@ -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