[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 483ceb4b1b983f398831a46d8db41aa48f88bd18..1108c8cee40b8b68241dba4d9d9c2042d0384e8b 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"
 /*
  * 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;
  *             if [ -f $I ]; then $I $1 ; fi
  *     done
  *     exit 1;


@@ -23,33 +23,47 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <sys/stat.h>

 #include <unistd.h>
 #include <unistd.h>

+#include <fcntl.h>
+

 #include "udev.h"
 #include "udev_lib.h"
 #include "udev.h"
 #include "udev_lib.h"

+#include "udevdb.h"

 #include "logging.h"
 
 #define DEVD_DIR                       "/etc/dev.d/"
 #define DEVD_SUFFIX                    ".dev"
 
 #include "logging.h"
 
 #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;
 {
        pid_t pid;

+       int fd;
+       struct udevice *udev = data;

 
 

-       dbg("running %s", name);
+       dbg("running %s", filename);

 
        pid = fork();
        switch (pid) {
        case 0:
                /* child */
 
        pid = fork();
        switch (pid) {
        case 0:
                /* child */

-               execv(name, main_argv);
+               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");
                dbg("exec of child failed");

-               exit(1);
+               _exit(1);

        case -1:
                dbg("fork of child failed");
                break;
                return -1;
        default:
        case -1:
                dbg("fork of child failed");
                break;
                return -1;
        default:

-               wait(NULL);
+               waitpid(pid, NULL, 0);

        }
 
        return 0;
        }
 
        return 0;


@@ -61,32 +75,47 @@ static int run_program(char *name)
  *     subsystem/
  *     default/
  */
  *     subsystem/
  *     default/
  */

-void dev_d_send(struct udevice *dev, char *subsystem, char *devpath)
+void dev_d_execute(struct udevice *udev)

 {
 {

-       char dirname[256];
+       char dirname[PATH_MAX];

        char devname[NAME_SIZE];
        char devname[NAME_SIZE];

+       char *temp;

 
 

+       /* skip if UDEV_NO_DEVD is set */

        if (udev_dev_d == 0)
                return;
 
        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);
-               setenv("DEVPATH", devpath, 1);
+       /* 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[0] = '\0';
+               strcpy(dirname, DEVD_DIR);
+               strfieldcat(dirname, devname);
+               call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
+
+               temp[0] = '/';
+               ++temp;
+               temp = strchr(temp, '/');

        }
        }

-       setenv("DEVNAME", devname, 1);
-       dbg("DEVNAME='%s'", devname);

 
        strcpy(dirname, DEVD_DIR);
 
        strcpy(dirname, DEVD_DIR);

-       strfieldcat(dirname, dev->name);
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       strfieldcat(dirname, udev->name);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);

 
        strcpy(dirname, DEVD_DIR);
 
        strcpy(dirname, DEVD_DIR);

-       strfieldcat(dirname, subsystem);
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       strfieldcat(dirname, udev->subsystem);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);

 
        strcpy(dirname, DEVD_DIR "default");
 
        strcpy(dirname, DEVD_DIR "default");

-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);

 }
 }