chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make SYSFS{} usable for all devices
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 7a0484472aa2ee0f63eefc05d12efdc934a4cdfe..6e0f7f1d0c535389c0ff56b1c2cbdc35213f1667 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-96,7
+96,7
@@
int main(int argc, char *argv[], char *envp[])
sigaction(SIGTERM, &act, NULL);
/* trigger timeout to prevent hanging processes */
sigaction(SIGTERM, &act, NULL);
/* trigger timeout to prevent hanging processes */
- alarm(ALARM_TIMEOUT);
+ alarm(
UDEV_
ALARM_TIMEOUT);
action = getenv("ACTION");
devpath = getenv("DEVPATH");
action = getenv("ACTION");
devpath = getenv("DEVPATH");
@@
-147,27
+147,29
@@
int main(int argc, char *argv[], char *envp[])
udev_rules_get_name(&rules, &udev, class_dev);
if (udev.ignore_device) {
info("device event will be ignored");
udev_rules_get_name(&rules, &udev, class_dev);
if (udev.ignore_device) {
info("device event will be ignored");
+ sysfs_close_class_device(class_dev);
goto cleanup;
}
if (udev.name[0] == '\0') {
info("device node creation supressed");
goto cleanup;
}
if (udev.name[0] == '\0') {
info("device node creation supressed");
+ sysfs_close_class_device(class_dev);
goto cleanup;
}
goto cleanup;
}
-
/* create node, store in db */
retval = udev_add_device(&udev, class_dev);
} else {
dbg("no dev-file found");
/* create node, store in db */
retval = udev_add_device(&udev, class_dev);
} else {
dbg("no dev-file found");
- udev_rules_get_run(&rules, &udev, NULL);
+ udev_rules_get_run(&rules, &udev,
class_dev,
NULL);
if (udev.ignore_device) {
info("device event will be ignored");
if (udev.ignore_device) {
info("device event will be ignored");
+ sysfs_close_class_device(class_dev);
goto cleanup;
}
}
sysfs_close_class_device(class_dev);
} else if (strcmp(action, "remove") == 0) {
dbg("node remove");
goto cleanup;
}
}
sysfs_close_class_device(class_dev);
} else if (strcmp(action, "remove") == 0) {
dbg("node remove");
- udev_rules_get_run(&rules, &udev, NULL);
+ udev_rules_get_run(&rules, &udev, NULL
, NULL
);
if (udev.ignore_device) {
dbg("device event will be ignored");
goto cleanup;
if (udev.ignore_device) {
dbg("device event will be ignored");
goto cleanup;
@@
-194,7
+196,7
@@
int main(int argc, char *argv[], char *envp[])
}
dbg("devices device opened '%s'", path);
wait_for_devices_device(devices_dev, &error);
}
dbg("devices device opened '%s'", path);
wait_for_devices_device(devices_dev, &error);
- udev_rules_get_run(&rules, &udev, devices_dev);
+ udev_rules_get_run(&rules, &udev,
NULL,
devices_dev);
sysfs_close_device(devices_dev);
if (udev.ignore_device) {
info("device event will be ignored");
sysfs_close_device(devices_dev);
if (udev.ignore_device) {
info("device event will be ignored");
@@
-202,7
+204,7
@@
int main(int argc, char *argv[], char *envp[])
}
} else {
dbg("default handling");
}
} else {
dbg("default handling");
- udev_rules_get_run(&rules, &udev, NULL);
+ udev_rules_get_run(&rules, &udev, NULL
, NULL
);
if (udev.ignore_device) {
info("device event will be ignored");
goto cleanup;
if (udev.ignore_device) {
info("device event will be ignored");
goto cleanup;