chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: get rid of SYSCONFDIR
[elogind.git]
/
src
/
libudev
/
libudev.c
diff --git
a/src/libudev/libudev.c
b/src/libudev/libudev.c
index af36cc44524c9f788f26d803afd4435f20a61400..72a372c6328d72f10cd6fe042b303f8a46ea0b3d 100644
(file)
--- a/
src/libudev/libudev.c
+++ b/
src/libudev/libudev.c
@@
-120,7
+120,7
@@
_public_ struct udev *udev_new(void)
udev->log_priority = LOG_ERR;
udev_list_init(udev, &udev->properties_list, true);
udev->log_priority = LOG_ERR;
udev_list_init(udev, &udev->properties_list, true);
- f = fopen(
SYSCONFDIR "
/udev/udev.conf", "re");
+ f = fopen(
"/etc
/udev/udev.conf", "re");
if (f != NULL) {
char line[UTIL_LINE_SIZE];
int line_nr = 0;
if (f != NULL) {
char line[UTIL_LINE_SIZE];
int line_nr = 0;
@@
-144,7
+144,7
@@
_public_ struct udev *udev_new(void)
/* split key/value */
val = strchr(key, '=');
if (val == NULL) {
/* split key/value */
val = strchr(key, '=');
if (val == NULL) {
- udev_err(udev, "missing <key>=<value> in
" SYSCONFDIR "
/udev/udev.conf[%i]; skip line\n", line_nr);
+ udev_err(udev, "missing <key>=<value> in
/etc
/udev/udev.conf[%i]; skip line\n", line_nr);
continue;
}
val[0] = '\0';
continue;
}
val[0] = '\0';
@@
-176,7
+176,7
@@
_public_ struct udev *udev_new(void)
/* unquote */
if (val[0] == '"' || val[0] == '\'') {
if (val[len-1] != val[0]) {
/* unquote */
if (val[0] == '"' || val[0] == '\'') {
if (val[len-1] != val[0]) {
- udev_err(udev, "inconsistent quoting in
" SYSCONFDIR "
/udev/udev.conf[%i]; skip line\n", line_nr);
+ udev_err(udev, "inconsistent quoting in
/etc
/udev/udev.conf[%i]; skip line\n", line_nr);
continue;
}
val[len-1] = '\0';
continue;
}
val[len-1] = '\0';