chiark / gitweb /
more fixups
[elogind.git] / udev_config.c
index 19f690c..51bdc72 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
@@ -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))
@@ -127,7 +121,8 @@ int parse_get_pair(char **orig_string, char **left, char **right)
 
 static int parse_config_file(void)
 {
-       char line[255];
+       char line[LINE_SIZE];
+       char *bufline;
        char *temp;
        char *variable;
        char *value;
@@ -148,32 +143,35 @@ static int parse_config_file(void)
        /* loop through the whole file */
        lineno = 0;
        cur = 0;
-       while (1) {
+       while (cur < bufsize) {
                count = buf_get_line(buf, bufsize, cur);
-
-               strncpy(line, buf + cur, count);
-               line[count] = '\0';
-               temp = line;
-               lineno++;
-
+               bufline = &buf[cur];
                cur += count+1;
-               if (cur > bufsize)
-                       break;
-
-               dbg_parse("read '%s'", temp);
+               lineno++;
 
-               /* eat the whitespace at the beginning of the line */
-               while (isspace(*temp))
-                       ++temp;
+               if (count >= LINE_SIZE) {
+                       info("line too long, conf line skipped %s, line %d",
+                                       udev_config_filename, lineno);
+                       continue;
+               }
 
-               /* empty line? */
-               if (*temp == 0x00)
+               /* eat the whitespace */
+               while ((count > 0) && isspace(bufline[0])) {
+                       bufline++;
+                       count--;
+               }
+               if (count == 0)
                        continue;
 
                /* see if this is a comment */
-               if (*temp == COMMENT_CHARACTER)
+               if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
+               strncpy(line, bufline, count);
+               line[count] = '\0';
+               temp = line;
+               dbg_parse("read '%s'", temp);
+
                retval = parse_get_pair(&temp, &variable, &value);
                if (retval != 0)
                        info("%s:%d:%Zd: error parsing '%s'",
@@ -183,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;
                }
 
@@ -246,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");
@@ -257,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);
@@ -266,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);