[PATCH] make the udev object available to more processing stages

[elogind.git] / dev_d.c

diff --git a/dev_d.c b/dev_d.c
index 5580b5a3627ea09ee59ed9acd47000cc0190d750..1108c8cee40b8b68241dba4d9d9c2042d0384e8b 100644 (file)
--- a/dev_d.c
+++ b/dev_d.c
@@ -35,19 +35,18 @@
 #define DEVD_DIR                       "/etc/dev.d/"
 #define DEVD_SUFFIX                    ".dev"
 
-static int run_program(char *name)
+static int run_program(const char *filename, void *data)
 {
        pid_t pid;
        int fd;
-       char *argv[3];
+       struct udevice *udev = data;
 
-       dbg("running %s", name);
+       dbg("running %s", filename);
 
        pid = fork();
        switch (pid) {
        case 0:
                /* child */
-               udevdb_exit();  /* close udevdb */
                fd = open("/dev/null", O_RDWR);
                if ( fd >= 0) {
                        dup2(fd, STDOUT_FILENO);
@@ -56,19 +55,15 @@ static int run_program(char *name)
                }
                close(fd);
 
-               argv[0] = name;
-               argv[1] = main_argv[1];
-               argv[2] = NULL;
-
-               execv(name, argv);
+               execl(filename, filename, udev->subsystem, NULL);
                dbg("exec of child failed");
-               exit(1);
+               _exit(1);
        case -1:
                dbg("fork of child failed");
                break;
                return -1;
        default:
-               wait(NULL);
+               waitpid(pid, NULL, 0);
        }
 
        return 0;
@@ -80,54 +75,47 @@ static int run_program(char *name)
  *     subsystem/
  *     default/
  */
-void dev_d_send(struct udevice *udev)
+void dev_d_execute(struct udevice *udev)
 {
-       char dirname[256];
-       char env_devname[NAME_SIZE];
-       char *devname;
+       char dirname[PATH_MAX];
+       char devname[NAME_SIZE];
        char *temp;
 
+       /* skip if UDEV_NO_DEVD is set */
        if (udev_dev_d == 0)
                return;
 
-       memset(env_devname, 0x00, sizeof(env_devname));
-       if (udev->type == 'b' || udev->type == 'c') {
-               strfieldcpy(env_devname, udev_root);
-               strfieldcat(env_devname, udev->name);
-       } else if (udev->type == 'n') {
-               strfieldcpy(env_devname, udev->name);
-               setenv("DEVPATH", udev->devpath, 1);
-       }
-       setenv("DEVNAME", env_devname, 1);
-       dbg("DEVNAME='%s'", env_devname);
-
-       devname = strdup(udev->name);
-       if (!devname) {
-               dbg("out of memory");
+       /* skip if udev did nothing, like unchanged netif or no "dev" file */
+       if (udev->devname[0] == '\0')
                return;
-       }
+
+       /* add the node name or the netif name to the environment */
+       setenv("DEVNAME", udev->devname, 1);
+       dbg("DEVNAME='%s'", udev->devname);
+
+       strfieldcpy(devname, udev->name);
 
        /* Chop the device name up into pieces based on '/' */
        temp = strchr(devname, '/');
        while (temp != NULL) {
-               *temp = 0x00;
+               temp[0] = '\0';
                strcpy(dirname, DEVD_DIR);
                strfieldcat(dirname, devname);
-               call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+               call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
 
-               *temp = '/';
+               temp[0] = '/';
                ++temp;
                temp = strchr(temp, '/');
        }
 
        strcpy(dirname, DEVD_DIR);
        strfieldcat(dirname, udev->name);
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
 
        strcpy(dirname, DEVD_DIR);
        strfieldcat(dirname, udev->subsystem);
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
 
        strcpy(dirname, DEVD_DIR "default");
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
 }