X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=773ee67f9e1a48abff33430ec7cc8ea95a65063f;hp=21b62488c00ad2b59d8dfc390c9db7bebc801002;hb=7628ff6e144a94c48e463d0188022f5661e0ba40;hpb=b9a8c4821a98df33ba2cc5b18b15d7175709c376 diff --git a/udev_config.c b/udev_config.c index 21b62488c..773ee67f9 100644 --- a/udev_config.c +++ b/udev_config.c @@ -21,9 +21,6 @@ * */ -/* define this to enable parsing debugging */ -/* #define DEBUG_PARSER */ - #include #include #include @@ -31,64 +28,77 @@ #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 "namedev.h" /* global variables */ -char sysfs_path[SYSFS_PATH_MAX]; -char udev_root[PATH_MAX]; -char udev_db_path[PATH_MAX+NAME_MAX]; -char udev_rules_filename[PATH_MAX+NAME_MAX]; -char udev_config_filename[PATH_MAX+NAME_MAX]; -int udev_log; -int udev_dev_d; -int udev_hotplug_d; - - -static int string_is_true(const char *str) +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_run; + +static int get_key(char **line, char **key, char **value) { - if (strcasecmp(str, "true") == 0) - return 1; - if (strcasecmp(str, "yes") == 0) - return 1; - if (strcasecmp(str, "1") == 0) - return 1; - return 0; -} + char *linepos; + char *temp; -static void init_variables(void) -{ - const char *env; + linepos = *line; + if (!linepos) + return -1; + + /* skip whitespace */ + while (isspace(linepos[0])) + linepos++; + + /* get the key */ + *key = linepos; + while (1) { + linepos++; + if (linepos[0] == '\0') + return -1; + if (isspace(linepos[0])) + break; + if (linepos[0] == '=') + break; + } - /* 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); + /* terminate key */ + linepos[0] = '\0'; + linepos++; - udev_log = string_is_true(UDEV_LOG_DEFAULT); + /* skip whitespace */ + while (isspace(linepos[0])) + linepos++; - udev_dev_d = 1; - env = getenv("UDEV_NO_DEVD"); - if (env && string_is_true(env)) - udev_dev_d = 0; + /* get the value*/ + if (linepos[0] == '"') + linepos++; + else + return -1; + *value = linepos; - udev_hotplug_d = 1; - env = getenv("UDEV_NO_HOTPLUGD"); - if (env && string_is_true(env)) - udev_hotplug_d = 0; + temp = strchr(linepos, '"'); + if (!temp) + return -1; + temp[0] = '\0'; + + return 0; } static int parse_config_file(void) { char line[LINE_SIZE]; char *bufline; - char *temp; + char *linepos; char *variable; char *value; char *buf; @@ -98,10 +108,8 @@ static int parse_config_file(void) int lineno; int retval = 0; - if (file_map(udev_config_filename, &buf, &bufsize) == 0) { - dbg("reading '%s' as config file", udev_config_filename); - } else { - dbg("can't open '%s' as config file", udev_config_filename); + if (file_map(udev_config_filename, &buf, &bufsize) != 0) { + err("can't open '%s' as config file", udev_config_filename); return -ENODEV; } @@ -114,9 +122,8 @@ static int parse_config_file(void) cur += count+1; lineno++; - if (count >= LINE_SIZE) { - info("line too long, conf line skipped %s, line %d", - udev_config_filename, lineno); + if (count >= sizeof(line)) { + err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno); continue; } @@ -132,82 +139,76 @@ static int parse_config_file(void) 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'", - udev_config_filename, lineno, temp-line, temp); + strlcpy(line, bufline, count+1); - dbg_parse("variable='%s', value='%s'", variable, value); + linepos = line; + retval = get_key(&linepos, &variable, &value); + if (retval != 0) { + err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line)); + continue; + } if (strcasecmp(variable, "udev_root") == 0) { - strfieldcpy(udev_root, value); - no_trailing_slash(udev_root); + strlcpy(udev_root, value, sizeof(udev_root)); + remove_trailing_char(udev_root, '/'); continue; } if (strcasecmp(variable, "udev_db") == 0) { - strfieldcpy(udev_db_path, value); - no_trailing_slash(udev_db_path); + strlcpy(udev_db_path, value, sizeof(udev_db_path)); + remove_trailing_char(udev_db_path, '/'); continue; } if (strcasecmp(variable, "udev_rules") == 0) { - strfieldcpy(udev_rules_filename, value); - no_trailing_slash(udev_rules_filename); + strlcpy(udev_rules_filename, value, sizeof(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; } - - info("%s:%d:%Zd: unknown key '%s'", - udev_config_filename, lineno, temp-line, temp); } file_unmap(buf, bufsize); return retval; } -static void get_dirs(void) +void udev_init_config(void) { - char *temp; - int retval; - - retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX); - if (retval) - dbg("sysfs_get_mnt_path failed"); - - /* see if we should try to override any of the default values */ - if (getenv("UDEV_TEST") != NULL) { - temp = getenv("SYSFS_PATH"); - if (temp != NULL) { - strfieldcpy(sysfs_path, temp); - no_trailing_slash(sysfs_path); - } + const char *env; - temp = getenv("UDEV_CONFIG_FILE"); - if (temp != NULL) - strfieldcpy(udev_config_filename, temp); + 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)); + + /* 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, '/'); } 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); -} - -void udev_init_config(void) -{ - init_variables(); - get_dirs(); + dbg("udev_db='%s'", udev_db_path); + dbg("udev_rules='%s'", udev_rules_filename); + dbg("udev_log=%d", udev_log_priority); }