summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-15 18:08:59 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-17 02:26:22 -0500
commit141a79f491fd4bf5ea0d66039065c9f9649bfc0e (patch)
tree9e13ad2015007d047b195661d2945c603770bb98 /src/core
parent8fe63cd4f16e1e7cdf528ff053f8eb4da7848455 (diff)
Extract looping over /proc/cmdline into a shared function
In cryptsetup-generator automatic cleanup had to be replaced with manual cleanup, and the code gets a bit longer. But existing code had the issue that it returned negative values from main(), which was wrong, so should be reworked anyway.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/main.c31
1 files changed, 1 insertions, 30 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 14e21d634b..fc85eedfe9 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -694,35 +694,6 @@ static int parse_config_file(void) {
return 0;
}
-static int parse_proc_cmdline(void) {
- _cleanup_free_ char *line = NULL;
- char *w, *state;
- size_t l;
- int r;
-
- r = proc_cmdline(&line);
- if (r < 0)
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- if (r <= 0)
- return 0;
-
- FOREACH_WORD_QUOTED(w, l, line, state) {
- _cleanup_free_ char *word;
-
- word = strndup(w, l);
- if (!word)
- return log_oom();
-
- r = parse_proc_cmdline_word(word);
- if (r < 0) {
- log_error("Failed on cmdline argument %s: %s", word, strerror(-r));
- return r;
- }
- }
-
- return 0;
-}
-
static int parse_argv(int argc, char *argv[]) {
enum {
@@ -1408,7 +1379,7 @@ int main(int argc, char *argv[]) {
goto finish;
if (arg_running_as == SYSTEMD_SYSTEM)
- if (parse_proc_cmdline() < 0)
+ if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
goto finish;
log_parse_environment();