chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: move more intellegince into parse_proc_cmdline()
[elogind.git]
/
src
/
quotacheck
/
quotacheck.c
diff --git
a/src/quotacheck/quotacheck.c
b/src/quotacheck/quotacheck.c
index 32f3ff904d7998e237f46b0c126d19742551009c..efd6e18308ae5d201d8d850d06679e668285b2d7 100644
(file)
--- a/
src/quotacheck/quotacheck.c
+++ b/
src/quotacheck/quotacheck.c
@@
-26,44
+26,33
@@
#include <unistd.h>
#include "util.h"
#include <unistd.h>
#include "util.h"
-#include "virt.h"
#include "fileio.h"
static bool arg_skip = false;
static bool arg_force = false;
#include "fileio.h"
static bool arg_skip = false;
static bool arg_force = false;
-static int parse_proc_cmdline(void) {
- char *line, *w, *state;
- int r;
- size_t l;
+static int parse_proc_cmdline_item(const char *key, const char *value) {
- if (detect_container(NULL) > 0)
- return 0;
+ if (streq(key, "quotacheck.mode") && value) {
- if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- return 0;
- }
-
- FOREACH_WORD_QUOTED(w, l, line, state) {
-
- if (strneq(w, "quotacheck.mode=auto", l))
+ if (streq(value, "auto"))
arg_force = arg_skip = false;
arg_force = arg_skip = false;
- else if (str
neq(w, "quotacheck.mode=force", l
))
+ else if (str
eq(value, "force"
))
arg_force = true;
arg_force = true;
- else if (str
neq(w, "quotacheck.mode=skip", l
))
+ else if (str
eq(value, "skip"
))
arg_skip = true;
arg_skip = true;
- else if (startswith(w, "quotacheck"))
- log_warning("Invalid quotacheck parameter. Ignoring.");
+ else
+ log_warning("Invalid quotacheck.mode= parameter. Ignoring.");
+
+ } else if (startswith(key, "quotacheck."))
+ log_warning("Invalid quotacheck parameter. Ignoring.");
#ifdef HAVE_SYSV_COMPAT
#ifdef HAVE_SYSV_COMPAT
- else if (strneq(w, "forcequotacheck", l)) {
- log_error("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
- arg_force = true;
- }
-#endif
+ else if (streq(key, "forcequotacheck") && !value) {
+ log_warning("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
+ arg_force = true;
}
}
+#endif
- free(line);
return 0;
}
return 0;
}
@@
-77,13
+66,13
@@
static void test_files(void) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
+
static const char * const cmdline[] = {
static const char * const cmdline[] = {
-
"/sbin/quotacheck"
,
+
QUOTACHECK
,
"-anug",
NULL
};
"-anug",
NULL
};
- int r = EXIT_FAILURE;
pid_t pid;
if (argc > 1) {
pid_t pid;
if (argc > 1) {
@@
-97,28
+86,26
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- parse_proc_cmdline();
+ parse_proc_cmdline(
parse_proc_cmdline_item
);
test_files();
if (!arg_force) {
if (arg_skip)
test_files();
if (!arg_force) {
if (arg_skip)
- return
0
;
+ return
EXIT_SUCCESS
;
if (access("/run/systemd/quotacheck", F_OK) < 0)
if (access("/run/systemd/quotacheck", F_OK) < 0)
- return
0
;
+ return
EXIT_SUCCESS
;
}
}
- if ((pid = fork()) < 0) {
+ pid = fork();
+ if (pid < 0) {
log_error("fork(): %m");
log_error("fork(): %m");
-
goto finish
;
+
return EXIT_FAILURE
;
} else if (pid == 0) {
/* Child */
execv(cmdline[0], (char**) cmdline);
_exit(1); /* Operational error */
}
} else if (pid == 0) {
/* Child */
execv(cmdline[0], (char**) cmdline);
_exit(1); /* Operational error */
}
- r = wait_for_terminate_and_warn("quotacheck", pid) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-
-finish:
- return r;
+ return wait_for_terminate_and_warn("quotacheck", pid) >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
}