[PATCH] big cleanup of internal udev api

[elogind.git] / dev_d.c

diff --git a/dev_d.c b/dev_d.c
index 0910e4d323e344246b590f93d7a4799355645ff6..5580b5a3627ea09ee59ed9acd47000cc0190d750 100644 (file)
--- a/dev_d.c
+++ b/dev_d.c
@@ -11,8 +11,8 @@
 /*
  * This essentially emulates the following shell script logic in C:
  *     DIR="/etc/dev.d"
- *     export DEVNODE="whatever_dev_name_udev_just_gave"
- *     for I in "${DIR}/$DEVNODE/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
+ *     export DEVNAME="whatever_dev_name_udev_just_gave"
+ *     for I in "${DIR}/$DEVNAME/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
  *             if [ -f $I ]; then $I $1 ; fi
  *     done
  *     exit 1;
@@ -23,9 +23,13 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
+
 #include "udev.h"
 #include "udev_lib.h"
+#include "udevdb.h"
 #include "logging.h"
 
 #define DEVD_DIR                       "/etc/dev.d/"
@@ -34,6 +38,8 @@
 static int run_program(char *name)
 {
        pid_t pid;
+       int fd;
+       char *argv[3];
 
        dbg("running %s", name);
 
@@ -41,7 +47,20 @@ static int run_program(char *name)
        switch (pid) {
        case 0:
                /* child */
-               execv(name, main_argv);
+               udevdb_exit();  /* close udevdb */
+               fd = open("/dev/null", O_RDWR);
+               if ( fd >= 0) {
+                       dup2(fd, STDOUT_FILENO);
+                       dup2(fd, STDIN_FILENO);
+                       dup2(fd, STDERR_FILENO);
+               }
+               close(fd);
+
+               argv[0] = name;
+               argv[1] = main_argv[1];
+               argv[2] = NULL;
+
+               execv(name, argv);
                dbg("exec of child failed");
                exit(1);
        case -1:
@@ -61,30 +80,52 @@ static int run_program(char *name)
  *     subsystem/
  *     default/
  */
-void dev_d_send(struct udevice *dev, char *subsystem)
+void dev_d_send(struct udevice *udev)
 {
        char dirname[256];
-       char devname[NAME_SIZE];
+       char env_devname[NAME_SIZE];
+       char *devname;
+       char *temp;
 
        if (udev_dev_d == 0)
                return;
 
-       if (dev->type == 'b' || dev->type == 'c') {
-               strfieldcpy(devname, udev_root);
-               strfieldcat(devname, dev->name);
-       } else if (dev->type == 'n') {
-               strfieldcpy(devname, dev->name);
+       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");
+               return;
+       }
+
+       /* Chop the device name up into pieces based on '/' */
+       temp = strchr(devname, '/');
+       while (temp != NULL) {
+               *temp = 0x00;
+               strcpy(dirname, DEVD_DIR);
+               strfieldcat(dirname, devname);
+               call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+
+               *temp = '/';
+               ++temp;
+               temp = strchr(temp, '/');
        }
-       setenv("DEVNODE", devname, 1); /* FIXME: bad name for netif */
-       setenv("DEVNAME", devname, 1);
-       dbg("DEVNAME='%s'", devname);
 
        strcpy(dirname, DEVD_DIR);
-       strfieldcat(dirname, dev->name);
+       strfieldcat(dirname, udev->name);
        call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
        strcpy(dirname, DEVD_DIR);
-       strfieldcat(dirname, subsystem);
+       strfieldcat(dirname, udev->subsystem);
        call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
        strcpy(dirname, DEVD_DIR "default");