scsi_id: add bsg.h

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 3d18e59796589435f8a0a8bcd828a062386f578a..42190945fc18b7ace35e86deb4b094d8a5eeb574 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -31,7 +31,7 @@
 /* global variables */
 char udev_root[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
-char udev_rules_filename[PATH_SIZE];
+char udev_rules_dir[PATH_SIZE];
 int udev_log_priority;
 int udev_run;
 
@@ -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;
        }
 
@@ -111,11 +111,6 @@ static int parse_config_file(void)
                cur += count+1;
                lineno++;
 
-               if (count >= sizeof(line)) {
-                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-                       continue;
-               }
-
                /* eat the whitespace */
                while ((count > 0) && isspace(bufline[0])) {
                        bufline++;
@@ -128,13 +123,18 @@ static int parse_config_file(void)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
+               if (count >= sizeof(line)) {
+                       err("line too long, conf line skipped %s, line %d\n", udev_config_filename, lineno);
+                       continue;
+               }
+
                memcpy(line, bufline, count);
                line[count] = '\0';
 
                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;
                }
 
@@ -145,8 +145,8 @@ static int parse_config_file(void)
                }
 
                if (strcasecmp(variable, "udev_rules") == 0) {
-                       strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
-                       remove_trailing_chars(udev_rules_filename, '/');
+                       strlcpy(udev_rules_dir, value, sizeof(udev_rules_dir));
+                       remove_trailing_chars(udev_rules_dir, '/');
                        continue;
                }
 
@@ -166,7 +166,7 @@ void udev_config_init(void)
 
        strcpy(udev_root, UDEV_ROOT);
        strcpy(udev_config_filename, UDEV_CONFIG_FILE);
-       strcpy(udev_rules_filename, UDEV_RULES_FILE);
+       strcpy(udev_rules_dir, UDEV_RULES_DIR);
        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_filename);
-       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='%s'\n", udev_rules_dir);
+       dbg("udev_log=%d\n", udev_log_priority);
 }