chiark / gitweb /
main: don't segfault when --log-color is passed without parameter
authorLennart Poettering <lennart@poettering.net>
Fri, 18 Jun 2010 21:13:15 +0000 (23:13 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 18 Jun 2010 21:13:15 +0000 (23:13 +0200)
src/main.c

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