chiark / gitweb /
more fixups
[elogind.git] / udev_config.c
index ba04003..51bdc72 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 
 #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"
 #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];
 /* 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];
 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;
 char default_owner_str[OWNER_SIZE];
 char default_group_str[GROUP_SIZE];
 int udev_log;
-int udev_sleep;
 int udev_dev_d;
 
 
 int udev_dev_d;
 
 
@@ -60,42 +59,31 @@ static int string_is_true(char *str)
                return 1;
        if (strcasecmp(str, "yes") == 0)
                return 1;
                return 1;
        if (strcasecmp(str, "yes") == 0)
                return 1;
+       if (strcasecmp(str, "1") == 0)
+               return 1;
        return 0;
 }
 
 static void init_variables(void)
 {
        return 0;
 }
 
 static void init_variables(void)
 {
+       char *env;
+
        /* fill up the defaults.  
         * If any config values are specified, they will
         * override these values. */
        strfieldcpy(udev_root, UDEV_ROOT);
        /* fill up the defaults.  
         * 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);
 
        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;
-       if (getenv("UDEV_NO_SLEEP") != NULL)
-               udev_sleep = 0;
-
        udev_dev_d = 1;
        udev_dev_d = 1;
-       if (getenv("UDEV_NO_DEVD") != NULL)
+       env = getenv("UDEV_NO_DEVD");
+       if (env && string_is_true(env))
                udev_dev_d = 0;
 }
 
                udev_dev_d = 0;
 }
 
-#define set_var(_name, _var)                           \
-       if (strcasecmp(variable, _name) == 0) {         \
-               dbg_parse("%s='%s'", _name, value);     \
-               strfieldcpy(_var, value);\
-       }
-
-#define set_bool(_name, _var)                          \
-       if (strcasecmp(variable, _name) == 0) {         \
-               dbg_parse("%s='%s'", _name, value);     \
-               _var = string_is_true(value);           \
-       }
-
 int parse_get_pair(char **orig_string, char **left, char **right)
 {
        char *temp;
 int parse_get_pair(char **orig_string, char **left, char **right)
 {
        char *temp;
@@ -133,7 +121,8 @@ int parse_get_pair(char **orig_string, char **left, char **right)
 
 static int parse_config_file(void)
 {
 
 static int parse_config_file(void)
 {
-       char line[255];
+       char line[LINE_SIZE];
+       char *bufline;
        char *temp;
        char *variable;
        char *value;
        char *temp;
        char *variable;
        char *value;
@@ -154,49 +143,89 @@ static int parse_config_file(void)
        /* loop through the whole file */
        lineno = 0;
        cur = 0;
        /* loop through the whole file */
        lineno = 0;
        cur = 0;
-       while (1) {
+       while (cur < bufsize) {
                count = buf_get_line(buf, bufsize, cur);
                count = buf_get_line(buf, bufsize, cur);
+               bufline = &buf[cur];
+               cur += count+1;
+               lineno++;
+
+               if (count >= LINE_SIZE) {
+                       info("line too long, conf line skipped %s, line %d",
+                                       udev_config_filename, lineno);
+                       continue;
+               }
+
+               /* eat the whitespace */
+               while ((count > 0) && isspace(bufline[0])) {
+                       bufline++;
+                       count--;
+               }
+               if (count == 0)
+                       continue;
+
+               /* see if this is a comment */
+               if (bufline[0] == COMMENT_CHARACTER)
+                       continue;
 
 
-               strncpy(line, buf + cur, count);
+               strncpy(line, bufline, count);
                line[count] = '\0';
                temp = line;
                line[count] = '\0';
                temp = line;
-               lineno++;
+               dbg_parse("read '%s'", temp);
 
 
-               cur += count+1;
-               if (cur > bufsize)
-                       break;
+               retval = parse_get_pair(&temp, &variable, &value);
+               if (retval != 0)
+                       info("%s:%d:%Zd: error parsing '%s'",
+                            udev_config_filename, lineno, temp-line, temp);
 
 
-               dbg_parse("read '%s'", temp);
+               dbg_parse("variable='%s', value='%s'", variable, value);
 
 
-               /* eat the whitespace at the beginning of the line */
-               while (isspace(*temp))
-                       ++temp;
+               if (strcasecmp(variable, "udev_root") == 0) {
+                       strfieldcpy(udev_root, value);
+                       no_trailing_slash(udev_root);
+                       continue;
+               }
 
 
-               /* empty line? */
-               if (*temp == 0x00)
+               if (strcasecmp(variable, "udev_db") == 0) {
+                       strfieldcpy(udev_db_path, value);
+                       no_trailing_slash(udev_db_path);
                        continue;
                        continue;
+               }
 
 
-               /* see if this is a comment */
-               if (*temp == COMMENT_CHARACTER)
+               if (strcasecmp(variable, "udev_rules") == 0) {
+                       strfieldcpy(udev_rules_filename, value);
+                       no_trailing_slash(udev_rules_filename);
                        continue;
                        continue;
+               }
 
 
-               retval = parse_get_pair(&temp, &variable, &value);
-               if (retval)
-                       break;
-               
-               dbg_parse("variable = '%s', value = '%s'", variable, value);
-
-               set_var("udev_root", udev_root);
-               set_var("udev_db", udev_db_filename);
-               set_var("udev_rules", udev_rules_filename);
-               set_var("udev_permissions", udev_permissions_filename);
-               set_var("default_mode", default_mode_str);
-               set_var("default_owner", default_owner_str);
-               set_var("default_group", default_group_str);
-               set_bool("udev_log", udev_log);
+               if (strcasecmp(variable, "udev_permissions") == 0) {
+                       strfieldcpy(udev_permissions_filename, value);
+                       no_trailing_slash(udev_permissions_filename);
+                       continue;
+               }
+
+               if (strcasecmp(variable, "default_mode") == 0) {
+                       strfieldcpy(default_mode_str, value);
+                       continue;
+               }
+
+               if (strcasecmp(variable, "default_owner") == 0) {
+                       strfieldcpy(default_owner_str, value);
+                       continue;
+               }
+
+               if (strcasecmp(variable, "default_group") == 0) {
+                       strfieldcpy(default_group_str, value);
+                       continue;
+               }
+
+               if (strcasecmp(variable, "udev_log") == 0) {
+                       udev_log = string_is_true(value);
+                       continue;
+               }
+
+               info("%s:%d:%Zd: unknown key '%s'",
+                    udev_config_filename, lineno, temp-line, temp);
        }
        }
-       dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
-                 lineno, temp - line, temp);
 
        file_unmap(buf, bufsize);
        return retval;
 
        file_unmap(buf, bufsize);
        return retval;
@@ -212,32 +241,34 @@ static void get_dirs(void)
                dbg("sysfs_get_mnt_path failed");
 
        /* see if we should try to override any of the default values */
                dbg("sysfs_get_mnt_path failed");
 
        /* see if we should try to override any of the default values */
-       temp = getenv("UDEV_TEST");
-       if (temp != NULL) {
-               /* hm testing is happening, use the specified values, if they are present */
+       if (getenv("UDEV_TEST") != NULL) {
                temp = getenv("SYSFS_PATH");
                temp = getenv("SYSFS_PATH");
-               if (temp)
+               if (temp != NULL) {
                        strfieldcpy(sysfs_path, temp);
                        strfieldcpy(sysfs_path, temp);
+                       no_trailing_slash(sysfs_path);
+               }
+
                temp = getenv("UDEV_CONFIG_FILE");
                temp = getenv("UDEV_CONFIG_FILE");
-               if (temp)
+               if (temp != NULL)
                        strfieldcpy(udev_config_filename, temp);
        }
                        strfieldcpy(udev_config_filename, temp);
        }
-       dbg("sysfs_path='%s'", sysfs_path);
 
 
+       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_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);
        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);
+
        parse_config_file();
 
        parse_config_file();
 
-       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_rules_filename = %s", udev_rules_filename);
-       dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-       dbg_parse("udev_log_str = %d", udev_log);
+       dbg("udev_root = %s", udev_root);
+       dbg("udev_config_filename = %s", udev_config_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);
 }
 
 void udev_init_config(void)
 }
 
 void udev_init_config(void)
@@ -245,5 +276,3 @@ void udev_init_config(void)
        init_variables();
        get_dirs();
 }
        init_variables();
        get_dirs();
 }
-
-