libvolume_id: fix weird fat volume recognition

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index c57e36cd8c21ce5115babf3c23780dbd11788255..7037a1708169a2135931cf9fde890f841e9f5b12 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -38,7 +38,6 @@
 /* global variables */
 char sysfs_path[PATH_SIZE];
 char udev_root[PATH_SIZE];
-char udev_db_path[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
 char udev_rules_filename[PATH_SIZE];
 int udev_log_priority;
@@ -107,7 +106,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", udev_config_filename);
+               err("can't open '%s' as config file: %s", udev_config_filename, strerror(errno));
                return -ENODEV;
        }
 
@@ -137,7 +136,8 @@ static int parse_config_file(void)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strlcpy(line, bufline, count+1);
+               memcpy(line, bufline, count);
+               line[count] = '\0';
 
                linepos = line;
                retval = get_key(&linepos, &variable, &value);
@@ -148,19 +148,13 @@ static int parse_config_file(void)
 
                if (strcasecmp(variable, "udev_root") == 0) {
                        strlcpy(udev_root, value, sizeof(udev_root));
-                       remove_trailing_char(udev_root, '/');
-                       continue;
-               }
-
-               if (strcasecmp(variable, "udev_db") == 0) {
-                       strlcpy(udev_db_path, value, sizeof(udev_db_path));
-                       remove_trailing_char(udev_db_path, '/');
+                       remove_trailing_chars(udev_root, '/');
                        continue;
                }
 
                if (strcasecmp(variable, "udev_rules") == 0) {
                        strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
-                       remove_trailing_char(udev_rules_filename, '/');
+                       remove_trailing_chars(udev_rules_filename, '/');
                        continue;
                }
 
@@ -179,7 +173,6 @@ void udev_init_config(void)
        const char *env;
 
        strcpy(udev_root, UDEV_ROOT);
-       strcpy(udev_db_path, UDEV_DB);
        strcpy(udev_config_filename, UDEV_CONFIG_FILE);
        strcpy(udev_rules_filename, UDEV_RULES_FILE);
        udev_log_priority = LOG_ERR;
@@ -194,7 +187,7 @@ void udev_init_config(void)
        env = getenv("UDEV_CONFIG_FILE");
        if (env) {
                strlcpy(udev_config_filename, env, sizeof(udev_config_filename));
-               remove_trailing_char(udev_config_filename, '/');
+               remove_trailing_chars(udev_config_filename, '/');
        }
 
        parse_config_file();
@@ -206,7 +199,6 @@ void udev_init_config(void)
        dbg("sysfs_path='%s'", sysfs_path);
        dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
        dbg("udev_root='%s'", udev_root);
-       dbg("udev_db='%s'", udev_db_path);
        dbg("udev_rules='%s'", udev_rules_filename);
        dbg("udev_log=%d", udev_log_priority);
 }