X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-event.c;h=2b4cc6923e2364d5ad131035cc282922aa6d1cd1;hp=703581a8b351382bdbf3c113ad9073748648a599;hb=83cd6b754b270091840456a2c8a66dae19f5a7dc;hpb=baa30fbc2c04b23209d0b8fb3c86cd15ef9ea81a diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 703581a8b..2b4cc6923 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -943,15 +943,20 @@ out: return err; } -int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask) +void udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask) { struct udev_list_entry *list_entry; - int err = 0; udev_list_entry_foreach(list_entry, udev_list_get_entry(&event->run_list)) { const char *cmd = udev_list_entry_get_name(list_entry); + enum udev_builtin_cmd builtin_cmd = udev_list_entry_get_num(list_entry); + + if (builtin_cmd < UDEV_BUILTIN_MAX) { + char command[UTIL_PATH_SIZE]; - if (strncmp(cmd, "socket:", strlen("socket:")) == 0) { + udev_event_apply_format(event, cmd, command, sizeof(command)); + udev_builtin_run(event->dev, builtin_cmd, command, false); + } else if (strncmp(cmd, "socket:", strlen("socket:")) == 0) { struct udev_monitor *monitor; monitor = udev_monitor_new_from_socket(event->udev, &cmd[strlen("socket:")]); @@ -970,11 +975,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask) udev_event_apply_format(event, cmd, program, sizeof(program)); envp = udev_device_get_properties_envp(event->dev); - if (udev_event_spawn(event, program, envp, sigmask, NULL, 0) < 0) { - if (udev_list_entry_get_num(list_entry)) - err = -1; - } + udev_event_spawn(event, program, envp, sigmask, NULL, 0); } } - return err; }