chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update RELEASE-NOTES + TODO
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index 773ee67f9e1a48abff33430ec7cc8ea95a65063f..c1af7c12ca8149c11e9981c79d19915d8e9e6d72 100644
(file)
--- a/
udev_config.c
+++ b/
udev_config.c
@@
-1,10
+1,8
@@
/*
* udev_config.c
*
/*
* udev_config.c
*
- * Userspace devfs
- *
* Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
* 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
*
* 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
@@
-40,7
+38,6
@@
/* global variables */
char sysfs_path[PATH_SIZE];
char udev_root[PATH_SIZE];
/* 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;
char udev_config_filename[PATH_SIZE];
char udev_rules_filename[PATH_SIZE];
int udev_log_priority;
@@
-109,7
+106,7
@@
static int parse_config_file(void)
int retval = 0;
if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
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;
}
return -ENODEV;
}
@@
-139,7
+136,8
@@
static int parse_config_file(void)
if (bufline[0] == COMMENT_CHARACTER)
continue;
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);
linepos = line;
retval = get_key(&linepos, &variable, &value);
@@
-150,19
+148,13
@@
static int parse_config_file(void)
if (strcasecmp(variable, "udev_root") == 0) {
strlcpy(udev_root, value, sizeof(udev_root));
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));
continue;
}
if (strcasecmp(variable, "udev_rules") == 0) {
strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
- remove_trailing_char(udev_rules_filename, '/');
+ remove_trailing_char
s
(udev_rules_filename, '/');
continue;
}
continue;
}
@@
-181,7
+173,6
@@
void udev_init_config(void)
const char *env;
strcpy(udev_root, UDEV_ROOT);
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;
strcpy(udev_config_filename, UDEV_CONFIG_FILE);
strcpy(udev_rules_filename, UDEV_RULES_FILE);
udev_log_priority = LOG_ERR;
@@
-196,11
+187,17
@@
void udev_init_config(void)
env = getenv("UDEV_CONFIG_FILE");
if (env) {
strlcpy(udev_config_filename, env, 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, '/');
+ remove_trailing_char
s
(udev_config_filename, '/');
}
parse_config_file();
}
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);
env = getenv("UDEV_LOG");
if (env)
udev_log_priority = log_priority(env);
@@
-208,7
+205,6
@@
void udev_init_config(void)
dbg("sysfs_path='%s'", sysfs_path);
dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
dbg("udev_root='%s'", udev_root);
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);
}
dbg("udev_rules='%s'", udev_rules_filename);
dbg("udev_log=%d", udev_log_priority);
}