chiark / gitweb /
udevcontrol: add max_childs command
[elogind.git] / udev_config.c
index 45b11de2aa573ef3485e7ef80fe5a6e8a0843e9a..773ee67f9e1a48abff33430ec7cc8ea95a65063f 100644 (file)
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <syslog.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_libc_wrapper.h"
 #include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "udev_rules.h"
 
 /* global variables */
 char sysfs_path[PATH_SIZE];
 char udev_root[PATH_SIZE];
 char udev_db_path[PATH_SIZE];
-char udev_rules_filename[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
-int udev_log;
-int udev_dev_d;
-int udev_hotplug_d;
-
-
-static int string_is_true(const char *str)
-{
-       if (strcasecmp(str, "true") == 0)
-               return 1;
-       if (strcasecmp(str, "yes") == 0)
-               return 1;
-       if (strcasecmp(str, "1") == 0)
-               return 1;
-       return 0;
-}
+char udev_rules_filename[PATH_SIZE];
+int udev_log_priority;
+int udev_run;
 
 static int get_key(char **line, char **key, char **value)
 {
@@ -107,29 +94,6 @@ static int get_key(char **line, char **key, char **value)
        return 0;
 }
 
-static void init_variables(void)
-{
-       const char *env;
-
-       /* If any config values are specified, they will override these values. */
-       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 = string_is_true(UDEV_LOG_DEFAULT);
-
-       udev_dev_d = 1;
-       env = getenv("UDEV_NO_DEVD");
-       if (env && string_is_true(env))
-               udev_dev_d = 0;
-
-       udev_hotplug_d = 1;
-       env = getenv("UDEV_NO_HOTPLUGD");
-       if (env && string_is_true(env))
-               udev_hotplug_d = 0;
-}
-
 static int parse_config_file(void)
 {
        char line[LINE_SIZE];
@@ -145,10 +109,9 @@ static int parse_config_file(void)
        int retval = 0;
 
        if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
-               dbg("can't open '%s' as config file", udev_config_filename);
+               err("can't open '%s' as config file", udev_config_filename);
                return -ENODEV;
        }
-       dbg("reading '%s' as config file", udev_config_filename);
 
        /* loop through the whole file */
        lineno = 0;
@@ -160,8 +123,7 @@ static int parse_config_file(void)
                lineno++;
 
                if (count >= sizeof(line)) {
-                       info("line too long, conf line skipped %s, line %d",
-                                       udev_config_filename, lineno);
+                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
                        continue;
                }
 
@@ -177,38 +139,35 @@ static int parse_config_file(void)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strlcpy(line, bufline, count);
-               dbg("read '%s'", line);
+               strlcpy(line, bufline, count+1);
 
                linepos = line;
                retval = get_key(&linepos, &variable, &value);
                if (retval != 0) {
-                       info("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
+                       err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
                        continue;
                }
 
-               dbg("variable='%s', value='%s'", variable, value);
-
                if (strcasecmp(variable, "udev_root") == 0) {
                        strlcpy(udev_root, value, sizeof(udev_root));
-                       no_trailing_slash(udev_root);
+                       remove_trailing_char(udev_root, '/');
                        continue;
                }
 
                if (strcasecmp(variable, "udev_db") == 0) {
                        strlcpy(udev_db_path, value, sizeof(udev_db_path));
-                       no_trailing_slash(udev_db_path);
+                       remove_trailing_char(udev_db_path, '/');
                        continue;
                }
 
                if (strcasecmp(variable, "udev_rules") == 0) {
                        strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
-                       no_trailing_slash(udev_rules_filename);
+                       remove_trailing_char(udev_rules_filename, '/');
                        continue;
                }
 
                if (strcasecmp(variable, "udev_log") == 0) {
-                       udev_log = string_is_true(value);
+                       udev_log_priority = log_priority(value);
                        continue;
                }
        }
@@ -219,30 +178,37 @@ static int parse_config_file(void)
 
 void udev_init_config(void)
 {
+       const char *env;
 
-       init_variables();
+       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;
+       udev_run = 1;
        sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
-       /* see if we should try to override any of the default values */
-       if (getenv("UDEV_TEST") != NULL) {
-               char *temp;
+       /* disable RUN key execution */
+       env = getenv("UDEV_RUN");
+       if (env && !string_is_true(env))
+               udev_run = 0;
 
-               temp = getenv("SYSFS_PATH");
-               if (temp != NULL) {
-                       strlcpy(sysfs_path, temp, sizeof(sysfs_path));
-                       no_trailing_slash(sysfs_path);
-               }
-
-               temp = getenv("UDEV_CONFIG_FILE");
-               if (temp != NULL)
-                       strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
+       env = getenv("UDEV_CONFIG_FILE");
+       if (env) {
+               strlcpy(udev_config_filename, env, sizeof(udev_config_filename));
+               remove_trailing_char(udev_config_filename, '/');
        }
 
        parse_config_file();
+
+       env = getenv("UDEV_LOG");
+       if (env)
+               udev_log_priority = log_priority(env);
+
        dbg("sysfs_path='%s'", sysfs_path);
+       dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
        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_log=%d", udev_log);
+       dbg("udev_db='%s'", udev_db_path);
+       dbg("udev_rules='%s'", udev_rules_filename);
+       dbg("udev_log=%d", udev_log_priority);
 }