chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
__thread --> thread_local for C11 compat
[elogind.git]
/
src
/
quotacheck
/
quotacheck.c
diff --git
a/src/quotacheck/quotacheck.c
b/src/quotacheck/quotacheck.c
index e7a44050277ffeb1c4e4c7d6c4519843de9344d1..622952a6e93e5ed87be147e34fcfb7f60d1b0a86 100644
(file)
--- a/
src/quotacheck/quotacheck.c
+++ b/
src/quotacheck/quotacheck.c
@@
-26,23
+26,22
@@
#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;
static int parse_proc_cmdline(void) {
static bool arg_skip = false;
static bool arg_force = false;
static int parse_proc_cmdline(void) {
-
char *line, *w, *state
;
-
int r
;
+
_cleanup_free_ char *line = NULL
;
+
char *w, *state
;
size_t l;
size_t l;
+ int r;
- if (detect_container(NULL) > 0)
- return 0;
-
- if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
+ r = proc_cmdline(&line);
+ if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return 0;
return 0;
- }
FOREACH_WORD_QUOTED(w, l, line, state) {
FOREACH_WORD_QUOTED(w, l, line, state) {
@@
-61,8
+60,6
@@
static int parse_proc_cmdline(void) {
}
#endif
}
}
#endif
}
-
- free(line);
return 0;
}
return 0;
}
@@
-76,13
+73,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) {
@@
-101,23
+98,21
@@
int main(int argc, char *argv[]) {
if (!arg_force) {
if (arg_skip)
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;
}
}