080 release

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index b6f578b27dfb0169ff00d5fb9b0a110b64ad1868..a7e19fe8646f6ea80e352299cec621a31a33694f 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -1,10 +1,8 @@
 /*
  * udev_config.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -30,53 +28,14 @@
 #include <ctype.h>
 #include <syslog.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
 
 /* 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;
-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;
-}
-
-static int log_priority(const char *priority)
-{
-       char *endptr;
-       int prio;
-
-       prio = strtol(priority, &endptr, 10);
-       if (endptr[0] == '\0')
-               return prio;
-       if (strncasecmp(priority, "err", 3) == 0)
-               return LOG_ERR;
-       if (strcasecmp(priority, "info") == 0)
-               return LOG_INFO;
-       if (strcasecmp(priority, "debug") == 0)
-               return LOG_DEBUG;
-       if (string_is_true(priority))
-               return LOG_ERR;
-
-       return 0;
-}
+int udev_run;
 
 static int get_key(char **line, char **key, char **value)
 {
@@ -141,7 +100,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;
        }
 
@@ -171,7 +130,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);
@@ -182,19 +142,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;
                }
 
@@ -208,43 +162,41 @@ static int parse_config_file(void)
        return retval;
 }
 
-void udev_init_config(void)
+void udev_config_init(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;
-       udev_dev_d = 1;
-       udev_hotplug_d = 1;
-       sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
+       udev_run = 1;
 
-       env = getenv("UDEV_NO_DEVD");
-       if (env && string_is_true(env))
-               udev_dev_d = 0;
-
-       env = getenv("UDEV_NO_HOTPLUGD");
-       if (env && string_is_true(env))
-               udev_hotplug_d = 0;
+       /* disable RUN key execution */
+       env = getenv("UDEV_RUN");
+       if (env && !string_is_true(env))
+               udev_run = 0;
 
        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();
 
+       env = getenv("UDEV_ROOT");
+       if (env) {
+               strlcpy(udev_root, env, sizeof(udev_root));
+               remove_trailing_chars(udev_root, '/');
+       }
+
        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_db='%s'", udev_db_path);
        dbg("udev_rules='%s'", udev_rules_filename);
        dbg("udev_log=%d", udev_log_priority);
 }