[PATCH] move execute_program to utils + add action to init_device

[elogind.git] / udev_multiplex.c

diff --git a/udev_multiplex.c b/udev_multiplex.c
index 3ef6e1707ac6b599af1dce0552d33a329f5ff787..22bbaf7b614bcef316cf28454b2b9793814f45da 100644 (file)
--- a/udev_multiplex.c
+++ b/udev_multiplex.c
@@ -32,38 +32,6 @@
 #include "udev_utils.h"
 #include "logging.h"
 
-static int run_program(struct udevice *udev, const char *filename)
-{
-       pid_t pid;
-       int fd;
-
-       dbg("running %s", filename);
-
-       pid = fork();
-       switch (pid) {
-       case 0:
-               /* child */
-               fd = open("/dev/null", O_RDWR);
-               if ( fd >= 0) {
-                       dup2(fd, STDOUT_FILENO);
-                       dup2(fd, STDIN_FILENO);
-                       dup2(fd, STDERR_FILENO);
-               }
-               close(fd);
-
-               execl(filename, filename, udev->subsystem, NULL);
-               dbg("exec of child failed");
-               _exit(1);
-       case -1:
-               dbg("fork of child failed");
-               break;
-               return -1;
-       default:
-               waitpid(pid, NULL, 0);
-       }
-
-       return 0;
-}
 
 /* 
  * runs files in these directories in order:
@@ -74,6 +42,8 @@ static int run_program(struct udevice *udev, const char *filename)
 void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix)
 {
        char dirname[PATH_SIZE];
+       struct name_entry *name_loop, *name_tmp;
+       LIST_HEAD(name_list);
 
        /* chop the device name up into pieces based on '/' */
        if (udev->name[0] != '\0') {
@@ -89,7 +59,7 @@ void udev_multiplex_directory(struct udevice *udev, const char *basedir, const c
                        if (strcmp(devname, udev->subsystem) != 0) {
                                snprintf(dirname, sizeof(dirname), "%s/%s", basedir, devname);
                                dirname[sizeof(dirname)-1] = '\0';
-                               call_foreach_file(run_program, udev, dirname, suffix);
+                               add_matching_files(&name_list, dirname, suffix);
                        }
 
                        temp[0] = '/';
@@ -101,16 +71,22 @@ void udev_multiplex_directory(struct udevice *udev, const char *basedir, const c
        if (udev->name[0] != '\0') {
                snprintf(dirname, sizeof(dirname), "%s/%s", basedir, udev->name);
                dirname[sizeof(dirname)-1] = '\0';
-               call_foreach_file(run_program, udev, dirname, suffix);
+               add_matching_files(&name_list, dirname, suffix);
        }
 
        if (udev->subsystem[0] != '\0') {
                snprintf(dirname, sizeof(dirname), "%s/%s", basedir, udev->subsystem);
                dirname[sizeof(dirname)-1] = '\0';
-               call_foreach_file(run_program, udev, dirname, suffix);
+               add_matching_files(&name_list, dirname, suffix);
        }
 
        snprintf(dirname, sizeof(dirname), "%s/default", basedir);
        dirname[sizeof(dirname)-1] = '\0';
-       call_foreach_file(run_program, udev, dirname, suffix);
+       add_matching_files(&name_list, dirname, suffix);
+
+       list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+               execute_command(name_loop->name, udev->subsystem);
+               list_del(&name_loop->node);
+       }
+
 }