X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=ae755f39fde82515b563d3892e750396227a7209;hp=6d39d294e1dba8843e93549eeae839f943fbad6c;hb=52a6ef66f2e98491b40b176619035abca3777a2c;hpb=274812b502089c55acb1bc7bfe99bebf9ce669b2 diff --git a/udev_config.c b/udev_config.c index 6d39d294e..ae755f39f 100644 --- a/udev_config.c +++ b/udev_config.c @@ -32,11 +32,12 @@ #include #include +#include "libsysfs/sysfs/libsysfs.h" #include "udev.h" +#include "udev_lib.h" #include "udev_version.h" #include "logging.h" #include "namedev.h" -#include "libsysfs/libsysfs.h" /* global variables */ char sysfs_path[SYSFS_PATH_MAX]; @@ -48,10 +49,25 @@ char udev_config_filename[PATH_MAX+NAME_MAX]; char default_mode_str[MODE_SIZE]; char default_owner_str[OWNER_SIZE]; char default_group_str[GROUP_SIZE]; +int udev_log; +int udev_dev_d; +static int string_is_true(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 void init_variables(void) { + char *env; + /* fill up the defaults. * If any config values are specified, they will * override these values. */ @@ -60,13 +76,13 @@ static void init_variables(void) 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); -#define set_var(_name, _var) \ - if (strcasecmp(variable, _name) == 0) { \ - dbg_parse("%s = '%s'", _name, value); \ - strncpy(_var, value, sizeof(_var)); \ - } + udev_dev_d = 1; + env = getenv("UDEV_NO_DEVD"); + if (env && string_is_true(env)) + udev_dev_d = 0; +} int parse_get_pair(char **orig_string, char **left, char **right) { @@ -105,16 +121,19 @@ int parse_get_pair(char **orig_string, char **left, char **right) static int parse_config_file(void) { - char line[255]; + char line[LINE_SIZE]; + char *bufline; char *temp; char *variable; char *value; - FILE *fd; - int lineno = 0; + char *buf; + size_t bufsize; + size_t cur; + size_t count; + int lineno; int retval = 0; - - fd = fopen(udev_config_filename, "r"); - if (fd != NULL) { + + 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); @@ -122,45 +141,92 @@ static int parse_config_file(void) } /* loop through the whole file */ - while (1) { - /* get a line */ - temp = fgets(line, sizeof(line), fd); - if (temp == NULL) - goto exit; + lineno = 0; + cur = 0; + while (cur < bufsize) { + count = buf_get_line(buf, bufsize, cur); + bufline = &buf[cur]; + cur += count+1; lineno++; - dbg_parse("read '%s'", temp); - - /* eat the whitespace at the beginning of the line */ - while (isspace(*temp)) - ++temp; + if (count >= LINE_SIZE) { + info("line too long, conf line skipped %s, line %d", + udev_config_filename, lineno); + continue; + } - /* empty line? */ - if (*temp == 0x00) + /* eat the whitespace */ + while ((count > 0) && isspace(bufline[0])) { + bufline++; + count--; + } + if (count == 0) continue; /* see if this is a comment */ - if (*temp == COMMENT_CHARACTER) + 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) - 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); + if (retval != 0) + info("%s:%d:%Zd: error parsing '%s'", + udev_config_filename, lineno, temp-line, temp); + + dbg_parse("variable='%s', value='%s'", variable, value); + + if (strcasecmp(variable, "udev_root") == 0) { + strfieldcpy(udev_root, value); + leading_slash(udev_root); + continue; + } + + if (strcasecmp(variable, "udev_db") == 0) { + strfieldcpy(udev_db_filename, value); + continue; + } + + if (strcasecmp(variable, "udev_rules") == 0) { + strfieldcpy(udev_rules_filename, value); + no_leading_slash(udev_rules_filename); + continue; + } + + if (strcasecmp(variable, "udev_permissions") == 0) { + strfieldcpy(udev_permissions_filename, value); + no_leading_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); -exit: - fclose(fd); + + file_unmap(buf, bufsize); return retval; } @@ -174,30 +240,34 @@ static void get_dirs(void) 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"); - if (temp) + if (temp != NULL) { strfieldcpy(sysfs_path, temp); + no_leading_slash(sysfs_path); + } + temp = getenv("UDEV_CONFIG_FILE"); - if (temp) + if (temp != NULL) 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_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 = %d", udev_log); + 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("udev_root = %s", udev_root); + dbg("udev_config_filename = %s", udev_config_filename); + dbg("udev_db_filename = %s", udev_db_filename); + 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) @@ -205,5 +275,3 @@ void udev_init_config(void) init_variables(); get_dirs(); } - -