chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vol_id: ID_LABEL_SAFE will no longer contain fancy characters
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index 0701d37e845d0466b8e639788a0e0f50dcb964f8..b8c4ffc8edbfa0d2e23ea73b195f731042d8a992 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
@@
-45,7
+43,6
@@
char udev_config_filename[PATH_SIZE];
char udev_rules_filename[PATH_SIZE];
int udev_log_priority;
int udev_run;
char udev_rules_filename[PATH_SIZE];
int udev_log_priority;
int udev_run;
-int udev_hotplug_d;
static int get_key(char **line, char **key, char **value)
{
static int get_key(char **line, char **key, char **value)
{
@@
-140,7
+137,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);
@@
-151,19
+149,19
@@
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, '/');
+ remove_trailing_char
s
(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));
- remove_trailing_char(udev_db_path, '/');
+ remove_trailing_char
s
(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));
- remove_trailing_char(udev_rules_filename, '/');
+ remove_trailing_char
s
(udev_rules_filename, '/');
continue;
}
continue;
}
@@
-187,7
+185,6
@@
void udev_init_config(void)
strcpy(udev_rules_filename, UDEV_RULES_FILE);
udev_log_priority = LOG_ERR;
udev_run = 1;
strcpy(udev_rules_filename, UDEV_RULES_FILE);
udev_log_priority = LOG_ERR;
udev_run = 1;
- udev_hotplug_d = 1;
sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
/* disable RUN key execution */
sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
/* disable RUN key execution */
@@
-195,14
+192,10
@@
void udev_init_config(void)
if (env && !string_is_true(env))
udev_run = 0;
if (env && !string_is_true(env))
udev_run = 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));
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();