X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fkmod-setup.c;h=fd0a0e06adcdff080d7af7512a216ebb25e4bca8;hp=23df1fdf36d12569a291e24aa0950a1785c40333;hb=5f68e74b6a795c5e3e1a6b3be3db85dfcd6b68c2;hpb=f84f9974d827314c8ee86f65a5007ccee210422b diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 23df1fdf3..fd0a0e06a 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -50,11 +50,24 @@ static void systemd_kmod_log( static bool cmdline_check_kdbus(void) { _cleanup_free_ char *line = NULL; + const char *p; + int r; - if (proc_cmdline(&line) < 0) + r = proc_cmdline(&line); + if (r < 0) return false; - return strstr(line, "kdbus") != NULL; + p = line; + for (;;) { + _cleanup_free_ char *word = NULL; + + r = unquote_first_word(&p, &word, true); + if (r <= 0) + return false; + + if (streq(word, "kdbus")) + return true; + } } #endif