[PATCH] disable logging for udevstart

[elogind.git] / dev_d.c

diff --git a/dev_d.c b/dev_d.c
index 0910e4d323e344246b590f93d7a4799355645ff6..d14c70c256d31a526e5f42b61d490eb61a94f632 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,33 +23,43 @@
 #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 "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;
+       int fd;
+       struct udevice *udev = data;
 
-       dbg("running %s", name);
+       dbg("running %s", filename);
 
        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");
-               exit(1);
+               _exit(1);
        case -1:
                dbg("fork of child failed");
                break;
                return -1;
        default:
-               wait(NULL);
+               waitpid(pid, NULL, 0);
        }
 
        return 0;
@@ -61,32 +71,40 @@ static int run_program(char *name)
  *     subsystem/
  *     default/
  */
-void dev_d_send(struct udevice *dev, char *subsystem)
+void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix)
 {
-       char dirname[256];
+       char dirname[PATH_MAX];
        char devname[NAME_SIZE];
+       char *temp;
 
+       /* skip if UDEV_NO_DEVD is set */
        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);
+       strfieldcpy(devname, udev->name);
+
+       /* chop the device name up into pieces based on '/' */
+       temp = strchr(devname, '/');
+       while (temp != NULL) {
+               temp[0] = '\0';
+               snprintf(dirname, PATH_MAX, "%s/%s", basedir, devname);
+               dirname[PATH_MAX-1] = '\0';
+               call_foreach_file(run_program, dirname, suffix, udev);
+
+               temp[0] = '/';
+               ++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);
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->name);
+       dirname[PATH_MAX-1] = '\0';
+       call_foreach_file(run_program, dirname, suffix, udev);
 
-       strcpy(dirname, DEVD_DIR);
-       strfieldcat(dirname, subsystem);
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->subsystem);
+       dirname[PATH_MAX-1] = '\0';
+       call_foreach_file(run_program, dirname, suffix, udev);
 
-       strcpy(dirname, DEVD_DIR "default");
-       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+       snprintf(dirname, PATH_MAX, "%s/default", basedir);
+       dirname[PATH_MAX-1] = '\0';
+       call_foreach_file(run_program, dirname, suffix, udev);
 }