chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce parse_ip_port (#4825)
[elogind.git]
/
src
/
basic
/
proc-cmdline.c
diff --git
a/src/basic/proc-cmdline.c
b/src/basic/proc-cmdline.c
index eb6ca61019b6e1f500362d4281e5fcc21b1fc707..281833f883f86a09ac2b68ec44414abce5e53a00 100644
(file)
--- a/
src/basic/proc-cmdline.c
+++ b/
src/basic/proc-cmdline.c
@@
-42,7
+42,9
@@
int proc_cmdline(char **ret) {
return read_one_line_file("/proc/cmdline", ret);
}
return read_one_line_file("/proc/cmdline", ret);
}
-int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value, void *data), void *data) {
+int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value, void *data),
+ void *data,
+ bool strip_prefix) {
_cleanup_free_ char *line = NULL;
const char *p;
int r;
_cleanup_free_ char *line = NULL;
const char *p;
int r;
@@
-56,7
+58,7
@@
int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value, voi
p = line;
for (;;) {
_cleanup_free_ char *word = NULL;
p = line;
for (;;) {
_cleanup_free_ char *word = NULL;
- char *value = NULL;
+ char *value = NULL
, *unprefixed
;
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_RELAX);
if (r < 0)
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_RELAX);
if (r < 0)
@@
-66,14
+68,15
@@
int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value, voi
/* Filter out arguments that are intended only for the
* initrd */
/* Filter out arguments that are intended only for the
* initrd */
- if (!in_initrd() && startswith(word, "rd."))
+ unprefixed = startswith(word, "rd.");
+ if (unprefixed && !in_initrd())
continue;
value = strchr(word, '=');
if (value)
*(value++) = 0;
continue;
value = strchr(word, '=');
if (value)
*(value++) = 0;
- r = parse_item(word, value, data);
+ r = parse_item(
strip_prefix && unprefixed ? unprefixed :
word, value, data);
if (r < 0)
return r;
}
if (r < 0)
return r;
}