chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.h: fix typo
[elogind.git]
/
src
/
shared
/
log.c
diff --git
a/src/shared/log.c
b/src/shared/log.c
index 9039db34964dc5230aaaa2c357b644026b491292..078ccdc35bf709b842c32bb0075fb6dc65cf5dcd 100644
(file)
--- a/
src/shared/log.c
+++ b/
src/shared/log.c
@@
-871,32
+871,34
@@
void log_parse_environment(void) {
if (r < 0)
log_warning("Failed to read /proc/cmdline. Ignoring: %s", strerror(-r));
else if (r > 0) {
if (r < 0)
log_warning("Failed to read /proc/cmdline. Ignoring: %s", strerror(-r));
else if (r > 0) {
- c
har *w
, *state;
+ c
onst char *word
, *state;
size_t l;
size_t l;
- FOREACH_WORD_QUOTED(w, l, line, state) {
- if (l == 5 && startswith(w, "debug")) {
+ FOREACH_WORD_QUOTED(w
ord
, l, line, state) {
+ if (l == 5 && startswith(w
ord
, "debug")) {
log_set_max_level(LOG_DEBUG);
break;
}
}
log_set_max_level(LOG_DEBUG);
break;
}
}
+ if (!isempty(state))
+ log_warning("Trailing garbage and the end of kernel commandline, ignoring.");
}
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)
}
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)
- log_warning("Failed to parse log target
%s
. Ignoring.", e);
+ log_warning("Failed to parse log target
'%s'
. Ignoring.", e);
e = secure_getenv("SYSTEMD_LOG_LEVEL");
if (e && log_set_max_level_from_string(e) < 0)
e = secure_getenv("SYSTEMD_LOG_LEVEL");
if (e && log_set_max_level_from_string(e) < 0)
- log_warning("Failed to parse log level
%s
. Ignoring.", e);
+ log_warning("Failed to parse log level
'%s'
. Ignoring.", e);
e = secure_getenv("SYSTEMD_LOG_COLOR");
if (e && log_show_color_from_string(e) < 0)
e = secure_getenv("SYSTEMD_LOG_COLOR");
if (e && log_show_color_from_string(e) < 0)
- log_warning("Failed to parse bool
%s
. Ignoring.", e);
+ log_warning("Failed to parse bool
'%s'
. Ignoring.", e);
e = secure_getenv("SYSTEMD_LOG_LOCATION");
if (e && log_show_location_from_string(e) < 0)
e = secure_getenv("SYSTEMD_LOG_LOCATION");
if (e && log_show_location_from_string(e) < 0)
- log_warning("Failed to parse bool
%s
. Ignoring.", e);
+ log_warning("Failed to parse bool
'%s'
. Ignoring.", e);
}
LogTarget log_get_target(void) {
}
LogTarget log_get_target(void) {