X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=3f226b9d7cd2f0e21a9ca3b1cdb56459dcbb37ff;hp=45b11de2aa573ef3485e7ef80fe5a6e8a0843e9a;hb=ae9d3bbd3dde5f6e7d2cf434a916c5f3d3bf68b0;hpb=28ce66de1750320d7f09547d8910d42ae580fe5e diff --git a/udev_config.c b/udev_config.c index 45b11de2a..3f226b9d7 100644 --- a/udev_config.c +++ b/udev_config.c @@ -1,10 +1,6 @@ /* - * udev_config.c - * - * Userspace devfs - * - * Copyright (C) 2003,2004 Greg Kroah-Hartman - * + * Copyright (C) 2003-2004 Greg Kroah-Hartman + * Copyright (C) 2004-2005 Kay Sievers * * 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 @@ -17,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -28,36 +24,16 @@ #include #include #include +#include -#include "libsysfs/sysfs/libsysfs.h" -#include "udev_libc_wrapper.h" #include "udev.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_dir[PATH_SIZE]; +int udev_log_priority; +int udev_run; static int get_key(char **line, char **key, char **value) { @@ -107,29 +83,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 +98,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: %s", udev_config_filename, strerror(errno)); return -ENODEV; } - dbg("reading '%s' as config file", udev_config_filename); /* loop through the whole file */ lineno = 0; @@ -160,8 +112,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 +128,30 @@ static int parse_config_file(void) if (bufline[0] == COMMENT_CHARACTER) continue; - strlcpy(line, bufline, count); - dbg("read '%s'", line); + memcpy(line, bufline, count); + line[count] = '\0'; 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); - continue; - } - - if (strcasecmp(variable, "udev_db") == 0) { - strlcpy(udev_db_path, value, sizeof(udev_db_path)); - no_trailing_slash(udev_db_path); + remove_trailing_chars(udev_root, '/'); continue; } if (strcasecmp(variable, "udev_rules") == 0) { - strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename)); - no_trailing_slash(udev_rules_filename); + strlcpy(udev_rules_dir, value, sizeof(udev_rules_dir)); + remove_trailing_chars(udev_rules_dir, '/'); continue; } if (strcasecmp(variable, "udev_log") == 0) { - udev_log = string_is_true(value); + udev_log_priority = log_priority(value); continue; } } @@ -217,32 +160,41 @@ static int parse_config_file(void) return retval; } -void udev_init_config(void) +void udev_config_init(void) { + const char *env; - init_variables(); - 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; + strcpy(udev_root, UDEV_ROOT); + strcpy(udev_config_filename, UDEV_CONFIG_FILE); + strcpy(udev_rules_dir, UDEV_RULES_DIR); + udev_log_priority = LOG_ERR; + udev_run = 1; + + /* 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_chars(udev_config_filename, '/'); + } - temp = getenv("SYSFS_PATH"); - if (temp != NULL) { - strlcpy(sysfs_path, temp, sizeof(sysfs_path)); - no_trailing_slash(sysfs_path); - } + parse_config_file(); - temp = getenv("UDEV_CONFIG_FILE"); - if (temp != NULL) - strlcpy(udev_config_filename, temp, sizeof(udev_config_filename)); + env = getenv("UDEV_ROOT"); + if (env) { + strlcpy(udev_root, env, sizeof(udev_root)); + remove_trailing_chars(udev_root, '/'); } - parse_config_file(); - dbg("sysfs_path='%s'", sysfs_path); + env = getenv("UDEV_LOG"); + if (env) + udev_log_priority = log_priority(env); + + 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_rules='%s'", udev_rules_dir); + dbg("udev_log=%d", udev_log_priority); }