[PATCH] support SUBSYSTEM as a rule key

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 20b6c75d32604fa1fe4263e5fee07d5600541aa2..198473936f08118c1d6c91d23efeb20be2b1b9dd 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -42,7 +42,7 @@
 /* global variables */
 char sysfs_path[SYSFS_PATH_MAX];
 char udev_root[PATH_MAX];
-char udev_db_filename[PATH_MAX+NAME_MAX];
+char udev_db_path[PATH_MAX+NAME_MAX];
 char udev_permissions_filename[PATH_MAX+NAME_MAX];
 char udev_rules_filename[PATH_MAX+NAME_MAX];
 char udev_config_filename[PATH_MAX+NAME_MAX];
@@ -50,7 +50,6 @@ char default_mode_str[MODE_SIZE];
 char default_owner_str[OWNER_SIZE];
 char default_group_str[GROUP_SIZE];
 int udev_log;
-int udev_sleep;
 int udev_dev_d;
 
 
@@ -73,17 +72,12 @@ static void init_variables(void)
         * If any config values are specified, they will
         * override these values. */
        strfieldcpy(udev_root, UDEV_ROOT);
-       strfieldcpy(udev_db_filename, UDEV_DB);
+       strfieldcpy(udev_db_path, UDEV_DB);
        strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
        strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
        strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
        udev_log = string_is_true(UDEV_LOG_DEFAULT);
 
-       udev_sleep = 1;
-       env = getenv("UDEV_NO_SLEEP");
-       if (env && string_is_true(env))
-               udev_sleep = 0;
-
        udev_dev_d = 1;
        env = getenv("UDEV_NO_DEVD");
        if (env && string_is_true(env))
@@ -161,15 +155,13 @@ static int parse_config_file(void)
                        continue;
                }
 
-               /* empty line? */
-               if (bufline[0] == '\0' || bufline[0] == '\n')
-                       continue;
-
                /* eat the whitespace */
-               while (isspace(bufline[0])) {
+               while ((count > 0) && isspace(bufline[0])) {
                        bufline++;
                        count--;
                }
+               if (count == 0)
+                       continue;
 
                /* see if this is a comment */
                if (bufline[0] == COMMENT_CHARACTER)
@@ -189,24 +181,25 @@ static int parse_config_file(void)
 
                if (strcasecmp(variable, "udev_root") == 0) {
                        strfieldcpy(udev_root, value);
-                       leading_slash(udev_root);
+                       no_trailing_slash(udev_root);
                        continue;
                }
 
                if (strcasecmp(variable, "udev_db") == 0) {
-                       strfieldcpy(udev_db_filename, value);
+                       strfieldcpy(udev_db_path, value);
+                       no_trailing_slash(udev_db_path);
                        continue;
                }
 
                if (strcasecmp(variable, "udev_rules") == 0) {
                        strfieldcpy(udev_rules_filename, value);
-                       no_leading_slash(udev_rules_filename);
+                       no_trailing_slash(udev_rules_filename);
                        continue;
                }
 
                if (strcasecmp(variable, "udev_permissions") == 0) {
                        strfieldcpy(udev_permissions_filename, value);
-                       no_leading_slash(udev_permissions_filename);
+                       no_trailing_slash(udev_permissions_filename);
                        continue;
                }
 
@@ -252,7 +245,7 @@ static void get_dirs(void)
                temp = getenv("SYSFS_PATH");
                if (temp != NULL) {
                        strfieldcpy(sysfs_path, temp);
-                       no_leading_slash(sysfs_path);
+                       no_trailing_slash(sysfs_path);
                }
 
                temp = getenv("UDEV_CONFIG_FILE");
@@ -263,7 +256,7 @@ static void get_dirs(void)
        dbg("sysfs_path='%s'", sysfs_path);
        dbg_parse("udev_root = %s", udev_root);
        dbg_parse("udev_config_filename = %s", udev_config_filename);
-       dbg_parse("udev_db_filename = %s", udev_db_filename);
+       dbg_parse("udev_db_path = %s", udev_db_path);
        dbg_parse("udev_rules_filename = %s", udev_rules_filename);
        dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
        dbg_parse("udev_log = %d", udev_log);
@@ -272,7 +265,7 @@ static void get_dirs(void)
 
        dbg("udev_root = %s", udev_root);
        dbg("udev_config_filename = %s", udev_config_filename);
-       dbg("udev_db_filename = %s", udev_db_filename);
+       dbg("udev_db_path = %s", udev_db_path);
        dbg("udev_rules_filename = %s", udev_rules_filename);
        dbg("udev_permissions_filename = %s", udev_permissions_filename);
        dbg("udev_log_str = %d", udev_log);