chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: use cached tty value where possible
[elogind.git]
/
src
/
sysctl.c
diff --git
a/src/sysctl.c
b/src/sysctl.c
index a8a9422ac35a9192a23af62d22b2800c6ea9430e..76ce9d864067f196f29e6c3327215d5a6cfe8d39 100644
(file)
--- a/
src/sysctl.c
+++ b/
src/sysctl.c
@@
-23,27
+23,24
@@
#include <stdbool.h>
#include <errno.h>
#include <string.h>
#include <stdbool.h>
#include <errno.h>
#include <string.h>
-#include <ftw.h>
#include <stdio.h>
#include <limits.h>
#include "log.h"
#include <stdio.h>
#include <limits.h>
#include "log.h"
+#include "strv.h"
#include "util.h"
#define PROC_SYS_PREFIX "/proc/sys/"
#include "util.h"
#define PROC_SYS_PREFIX "/proc/sys/"
-static int exit_code = 0;
-
-static void apply_sysctl(const char *property, const char *value) {
+static int apply_sysctl(const char *property, const char *value) {
char *p, *n;
char *p, *n;
- int r;
+ int r
= 0, k
;
log_debug("Setting '%s' to '%s'", property, value);
if (!(p = new(char, sizeof(PROC_SYS_PREFIX) + strlen(property)))) {
log_error("Out of memory");
log_debug("Setting '%s' to '%s'", property, value);
if (!(p = new(char, sizeof(PROC_SYS_PREFIX) + strlen(property)))) {
log_error("Out of memory");
- exit_code = -ENOMEM;
- return;
+ return -ENOMEM;
}
n = stpcpy(p, PROC_SYS_PREFIX);
}
n = stpcpy(p, PROC_SYS_PREFIX);
@@
-53,38
+50,45
@@
static void apply_sysctl(const char *property, const char *value) {
if (*n == '.')
*n = '/';
if (*n == '.')
*n = '/';
- if ((
r
= write_one_line_file(p, value)) < 0) {
+ if ((
k
= write_one_line_file(p, value)) < 0) {
- log_full(
r
== -ENOENT ? LOG_DEBUG : LOG_WARNING,
- "Failed to write '%s' to '%s': %s", value, p, strerror(-
r
));
+ log_full(
k
== -ENOENT ? LOG_DEBUG : LOG_WARNING,
+ "Failed to write '%s' to '%s': %s", value, p, strerror(-
k
));
- if (
r != -ENOENT
)
-
exit_code = r
;
+ if (
k != -ENOENT && r == 0
)
+
r = k
;
}
free(p);
}
free(p);
+
+ return r;
}
}
-static
void apply_file(const char *path
) {
+static
int apply_file(const char *path, bool ignore_enoent
) {
FILE *f;
FILE *f;
+ int r = 0;
assert(path);
if (!(f = fopen(path, "re"))) {
assert(path);
if (!(f = fopen(path, "re"))) {
+ if (ignore_enoent && errno == ENOENT)
+ return 0;
+
log_error("Failed to open file '%s', ignoring: %m", path);
log_error("Failed to open file '%s', ignoring: %m", path);
- exit_code = -errno;
- return;
+ return -errno;
}
}
+ log_debug("apply: %s\n", path);
while (!feof(f)) {
char l[LINE_MAX], *p, *value;
while (!feof(f)) {
char l[LINE_MAX], *p, *value;
+ int k;
if (!fgets(l, sizeof(l), f)) {
if (feof(f))
break;
log_error("Failed to read file '%s', ignoring: %m", path);
if (!fgets(l, sizeof(l), f)) {
if (feof(f))
break;
log_error("Failed to read file '%s', ignoring: %m", path);
-
exit_code
= -errno;
+
r
= -errno;
goto finish;
}
goto finish;
}
@@
-98,40
+102,27
@@
static void apply_file(const char *path) {
if (!(value = strchr(p, '='))) {
log_error("Line is not an assignment in file '%s': %s", path, value);
if (!(value = strchr(p, '='))) {
log_error("Line is not an assignment in file '%s': %s", path, value);
- exit_code = -EINVAL;
+
+ if (r == 0)
+ r = -EINVAL;
continue;
}
*value = 0;
value++;
continue;
}
*value = 0;
value++;
- apply_sysctl(strstrip(p), strstrip(value));
+ if ((k = apply_sysctl(strstrip(p), strstrip(value))) < 0 && r == 0)
+ r = k;
}
finish:
fclose(f);
}
finish:
fclose(f);
-}
-static int nftw_cb(
- const char *fpath,
- const struct stat *sb,
- int tflag,
- struct FTW *ftwbuf) {
-
- if (tflag != FTW_F)
- return 0;
-
- if (ignore_file(fpath + ftwbuf->base))
- return 0;
-
- if (!endswith(fpath, ".conf"))
- return 0;
-
- apply_file(fpath);
- return 0;
-};
+ return r;
+}
int main(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
+ int r = 0;
if (argc > 2) {
log_error("This program expects one or no arguments.");
if (argc > 2) {
log_error("This program expects one or no arguments.");
@@
-143,11
+134,35
@@
int main(int argc, char *argv[]) {
log_open();
if (argc > 1)
log_open();
if (argc > 1)
-
nftw(argv[1], nftw_cb, 64, FTW_MOUNT|FTW_PHYS
);
+
r = apply_file(argv[1], false
);
else {
else {
- nftw("/etc/sysctl.conf", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
- nftw("/etc/sysctl.d", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
- }
+ char **files, **f;
+
+
+ r = conf_files_list(&files, ".conf",
+ "/run/sysctl.d",
+ "/etc/sysctl.d",
+ "/usr/local/lib/sysctl.d",
+ "/usr/lib/sysctl.d",
+ "/lib/sysctl.d",
+ NULL);
+ if (r < 0) {
+ log_error("Failed to enumerate sysctl.d files: %s", strerror(-r));
+ goto finish;
+ }
- return exit_code < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ STRV_FOREACH(f, files) {
+ int k;
+
+ k = apply_file(*f, true);
+ if (k < 0 && r == 0)
+ r = k;
+ }
+
+ apply_file("/etc/sysctl.conf", true);
+
+ strv_free(files);
+ }
+finish:
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
}