chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev_rules.c: don't change sysfs_device while walking up the device chain
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index 77ac38a791e1f891c5800517cedc3fd0411fd329..b6f578b27dfb0169ff00d5fb9b0a110b64ad1868 100644
(file)
--- a/
udev_config.c
+++ b/
udev_config.c
@@
-28,6
+28,7
@@
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
+#include <syslog.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "udev_libc_wrapper.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev_libc_wrapper.h"
@@
-35,19
+36,17
@@
#include "udev_utils.h"
#include "udev_version.h"
#include "logging.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];
/* 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];
char udev_config_filename[PATH_SIZE];
-int udev_log;
+char udev_rules_filename[PATH_SIZE];
+int udev_log_priority;
int udev_dev_d;
int udev_hotplug_d;
int udev_dev_d;
int udev_hotplug_d;
-
static int string_is_true(const char *str)
{
if (strcasecmp(str, "true") == 0)
static int string_is_true(const char *str)
{
if (strcasecmp(str, "true") == 0)
@@
-59,34
+58,79
@@
static int string_is_true(const char *str)
return 0;
}
return 0;
}
-static
void init_variables(void
)
+static
int log_priority(const char *priority
)
{
{
- const char *env;
+ 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;
- /* 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);
+ return 0;
+}
- udev_log = string_is_true(UDEV_LOG_DEFAULT);
+static int get_key(char **line, char **key, char **value)
+{
+ char *linepos;
+ char *temp;
- udev_dev_d = 1;
- env = getenv("UDEV_NO_DEVD");
- if (env && string_is_true(env))
- udev_dev_d = 0;
+ 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;
+ }
- udev_hotplug_d = 1;
- env = getenv("UDEV_NO_HOTPLUGD");
- if (env && string_is_true(env))
- udev_hotplug_d = 0;
+ /* terminate key */
+ linepos[0] = '\0';
+ linepos++;
+
+ /* skip whitespace */
+ while (isspace(linepos[0]))
+ linepos++;
+
+ /* get the value*/
+ if (linepos[0] == '"')
+ linepos++;
+ else
+ return -1;
+ *value = linepos;
+
+ temp = strchr(linepos, '"');
+ if (!temp)
+ return -1;
+ temp[0] = '\0';
+
+ return 0;
}
static int parse_config_file(void)
{
char line[LINE_SIZE];
char *bufline;
}
static int parse_config_file(void)
{
char line[LINE_SIZE];
char *bufline;
- char *
temp
;
+ char *
linepos
;
char *variable;
char *value;
char *buf;
char *variable;
char *value;
char *buf;
@@
-97,10
+141,9
@@
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) {
-
dbg
("can't open '%s' as config file", udev_config_filename);
+
err
("can't open '%s' as config file", udev_config_filename);
return -ENODEV;
}
return -ENODEV;
}
- dbg("reading '%s' as config file", udev_config_filename);
/* loop through the whole file */
lineno = 0;
/* loop through the whole file */
lineno = 0;
@@
-112,8
+155,7
@@
static int parse_config_file(void)
lineno++;
if (count >= sizeof(line)) {
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;
}
continue;
}
@@
-129,37
+171,35
@@
static int parse_config_file(void)
if (bufline[0] == COMMENT_CHARACTER)
continue;
if (bufline[0] == COMMENT_CHARACTER)
continue;
- strlcpy(line, bufline, count);
- temp = line;
- dbg("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("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) {
strlcpy(udev_root, value, sizeof(udev_root));
if (strcasecmp(variable, "udev_root") == 0) {
strlcpy(udev_root, value, sizeof(udev_root));
-
no_trailing_slash(udev_root
);
+
remove_trailing_char(udev_root, '/'
);
continue;
}
if (strcasecmp(variable, "udev_db") == 0) {
strlcpy(udev_db_path, value, sizeof(udev_db_path));
continue;
}
if (strcasecmp(variable, "udev_db") == 0) {
strlcpy(udev_db_path, value, sizeof(udev_db_path));
-
no_trailing_slash(udev_db_path
);
+
remove_trailing_char(udev_db_path, '/'
);
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));
-
no_trailing_slash(udev_rules_filename
);
+
remove_trailing_char(udev_rules_filename, '/'
);
continue;
}
if (strcasecmp(variable, "udev_log") == 0) {
continue;
}
if (strcasecmp(variable, "udev_log") == 0) {
- udev_log
= string_is_true
(value);
+ udev_log
_priority = log_priority
(value);
continue;
}
}
continue;
}
}
@@
-168,39
+208,43
@@
static int parse_config_file(void)
return retval;
}
return retval;
}
-
static void get_dirs
(void)
+
void udev_init_config
(void)
{
{
- char *temp;
- int retval;
-
- retval = sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
- 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) {
- strlcpy(sysfs_path, temp, sizeof(sysfs_path));
- no_trailing_slash(sysfs_path);
- }
+ 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));
- temp = getenv("UDEV_CONFIG_FILE");
- if (temp != NULL)
- strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
+ 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;
+
+ 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();
}
parse_config_file();
+
+ env = getenv("UDEV_LOG");
+ if (env)
+ udev_log_priority = log_priority(env);
+
dbg("sysfs_path='%s'", sysfs_path);
dbg("sysfs_path='%s'", sysfs_path);
+ dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
dbg("udev_root='%s'", udev_root);
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);
}
}