X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test-udev.c;h=0c25778aa68d5ba1c96e3b43e6e765bcb00a6aa0;hp=e40a4484367b1b6d35401cb8f63acb0a70b09f04;hb=49369cafe412e734e174fa3dccd5878499d28702;hpb=456cb387567da8a2beadf003dcbd874022dbc873 diff --git a/test-udev.c b/test-udev.c index e40a44843..0c25778aa 100644 --- a/test-udev.c +++ b/test-udev.c @@ -136,7 +136,7 @@ int main(int argc, char *argv[], char *envp[]) goto fail; } - udev = udev_device_init(); + udev = udev_device_init(NULL); if (udev == NULL) goto fail; @@ -154,22 +154,8 @@ int main(int argc, char *argv[], char *envp[]) retval = udev_device_event(&rules, udev); - if (retval == 0 && !udev->ignore_device && udev_run) { - struct name_entry *name_loop; - - dbg("executing run list"); - list_for_each_entry(name_loop, &udev->run_list, node) { - if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) - pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action); - else { - char program[PATH_SIZE]; - - strlcpy(program, name_loop->name, sizeof(program)); - udev_rules_apply_format(udev, program, sizeof(program)); - run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO)); - } - } - } + if (retval == 0 && !udev->ignore_device && udev_run) + udev_rules_run(udev); udev_device_cleanup(udev); fail: