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

Extract looping over /proc/cmdline into a shared function

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-02-17 02:26:22 -05:00
parent 8fe63cd4f1
commit 141a79f491
8 changed files with 229 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules-load/modules-load.c
+9 -29
View File
@@ -69,39 +69,19 @@ static int add_modules(const char *p) {
return 0;
}
static int parse_proc_cmdline(void) {
_cleanup_free_ char *line = NULL;
char *w, *state;
size_t l;
static int parse_proc_cmdline_word(const char *word) {
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;
if (startswith(word, "modules-load=")) {
r = add_modules(word + 13);
if (r < 0)
return r;
FOREACH_WORD_QUOTED(w, l, line, state) {
_cleanup_free_ char *word;
word = strndup(w, l);
if (!word)
return log_oom();
if (startswith(word, "modules-load=")) {
r = add_modules(word + 13);
} else if (startswith(word, "rd.modules-load=")) {
if (in_initrd()) {
r = add_modules(word + 16);
if (r < 0)
return r;
} else if (startswith(word, "rd.modules-load=")) {
if (in_initrd()) {
r = add_modules(word + 16);
if (r < 0)
return r;
}
}
}
@@ -273,7 +253,7 @@ int main(int argc, char *argv[]) {
umask(0022);
if (parse_proc_cmdline() < 0)
if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
return EXIT_FAILURE;
ctx = kmod_new(NULL, NULL);