picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

main: don't segfault when --log-color is passed without parameter

Browse source
This commit is contained in:
Lennart Poettering 2010-06-18 23:13:15 +02:00
parent c952c6ece2
commit d0b170c813
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main.c
View file

@ -412,19 +412,25 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_LOG_COLOR: case ARG_LOG_COLOR:
if ((r = log_show_color_from_string(optarg)) < 0) { if (optarg) {
log_error("Failed to parse log color setting %s.", optarg); if ((r = log_show_color_from_string(optarg)) < 0) {
return r; log_error("Failed to parse log color setting %s.", optarg);
} return r;
}
} else
log_show_color(true);
break; break;
case ARG_LOG_LOCATION: case ARG_LOG_LOCATION:
if ((r = log_show_location_from_string(optarg)) < 0) { if (optarg) {
log_error("Failed to parse log location setting %s.", optarg); if ((r = log_show_location_from_string(optarg)) < 0) {
return r; log_error("Failed to parse log location setting %s.", optarg);
} return r;
}
} else
log_show_location(true);
break; break;