ignore rule with GOTO to a non-existent label

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 2f2a69eb487a6fc1fc2e047df32ecc1bbee579ff..55f0361dd2ae46c5bce0703878d176c11c44d496 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -98,7 +98,7 @@ static int parse_config_file(void)
        int retval = 0;
 
        if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
-               err("can't open '%s' as config file: %s", udev_config_filename, strerror(errno));
+               err("can't open '%s' as config file: %s\n", udev_config_filename, strerror(errno));
                return -ENODEV;
        }
 
@@ -124,7 +124,7 @@ static int parse_config_file(void)
                        continue;
 
                if (count >= sizeof(line)) {
-                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+                       err("line too long, conf line skipped %s, line %d\n", udev_config_filename, lineno);
                        continue;
                }
 
@@ -134,7 +134,7 @@ static int parse_config_file(void)
                linepos = line;
                retval = get_key(&linepos, &variable, &value);
                if (retval != 0) {
-                       err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int)(linepos-line));
+                       err("error parsing %s, line %d:%d\n", udev_config_filename, lineno, (int)(linepos-line));
                        continue;
                }
 
@@ -164,9 +164,9 @@ void udev_config_init(void)
 {
        const char *env;
 
-       strcpy(udev_root, UDEV_ROOT);
        strcpy(udev_config_filename, UDEV_CONFIG_FILE);
-       strcpy(udev_rules_dir, UDEV_RULES_DIR);
+       strcpy(udev_root, UDEV_ROOT);
+       udev_rules_dir[0] = '\0';
        udev_log_priority = LOG_ERR;
        udev_run = 1;
 
@@ -193,8 +193,8 @@ void udev_config_init(void)
        if (env)
                udev_log_priority = log_priority(env);
 
-       dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
-       dbg("udev_root='%s'", udev_root);
-       dbg("udev_rules='%s'", udev_rules_dir);
-       dbg("udev_log=%d", udev_log_priority);
+       dbg("UDEV_CONFIG_FILE='%s'\n", udev_config_filename);
+       dbg("udev_root='%s'\n", udev_root);
+       dbg("udev_rules_dir='%s'\n", udev_rules_dir);
+       dbg("udev_log=%d\n", udev_log_priority);
 }