chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'make tests' as I'm always typing that one wrong...
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 1c55ec14b8764ec898734cf2fd236deb056206b2..d44f73081d2f7606a4a9220be0d782f601b17ce1 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-68,6
+68,7
@@
static void asmlinkage sig_handler(int signum)
int main(int argc, char *argv[], char *envp[])
{
struct udevice udev;
int main(int argc, char *argv[], char *envp[])
{
struct udevice udev;
+ struct udev_rules rules;
char path[PATH_SIZE];
const char *error;
const char *action;
char path[PATH_SIZE];
const char *error;
const char *action;
@@
-95,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");
@@
-118,7
+119,7
@@
int main(int argc, char *argv[], char *envp[])
}
udev_init_device(&udev, devpath, subsystem, action);
}
udev_init_device(&udev, devpath, subsystem, action);
- udev_rules_init();
+ udev_rules_init(
&rules, 0
);
if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
/* handle device node */
if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
/* handle device node */
@@
-143,7
+144,7
@@
int main(int argc, char *argv[], char *envp[])
if (udev.type == DEV_NET || udev.devt) {
/* name device */
if (udev.type == DEV_NET || udev.devt) {
/* name device */
- udev_rules_get_name(&udev, class_dev);
+ udev_rules_get_name(&
rules, &
udev, class_dev);
if (udev.ignore_device) {
info("device event will be ignored");
goto cleanup;
if (udev.ignore_device) {
info("device event will be ignored");
goto cleanup;
@@
-157,7
+158,7
@@
int main(int argc, char *argv[], char *envp[])
retval = udev_add_device(&udev, class_dev);
} else {
dbg("no dev-file found");
retval = udev_add_device(&udev, class_dev);
} else {
dbg("no dev-file found");
- udev_rules_get_run(&udev, NULL);
+ udev_rules_get_run(&
rules, &
udev, 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;
@@
-166,7
+167,7
@@
int main(int argc, char *argv[], char *envp[])
sysfs_close_class_device(class_dev);
} else if (strcmp(action, "remove") == 0) {
dbg("node remove");
sysfs_close_class_device(class_dev);
} else if (strcmp(action, "remove") == 0) {
dbg("node remove");
- udev_rules_get_run(&udev, NULL);
+ udev_rules_get_run(&
rules, &
udev, 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;
@@
-193,7
+194,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(&udev, devices_dev);
+ udev_rules_get_run(&
rules, &
udev, 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");
@@
-201,7
+202,7
@@
int main(int argc, char *argv[], char *envp[])
}
} else {
dbg("default handling");
}
} else {
dbg("default handling");
- udev_rules_get_run(&udev, NULL);
+ udev_rules_get_run(&
rules, &
udev, 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;