[PATCH] PATCH udev close on exec

[elogind.git] / dev_d.c

diff --git a/dev_d.c b/dev_d.c
index 81c70133159203970bba27ff074e0486004a580b..c091f11c28726cc02d5a165bdecd38d7befad1da 100644 (file)
--- a/dev_d.c
+++ b/dev_d.c
@@ -23,9 +23,13 @@
 #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/"
 #include "logging.h"
 
 #define DEVD_DIR                       "/etc/dev.d/"


@@ -34,6 +38,7 @@
 static int run_program(char *name)
 {
        pid_t pid;
 static int run_program(char *name)
 {
        pid_t pid;

+       int fd;

 
        dbg("running %s", name);
 
 
        dbg("running %s", name);
 


@@ -41,6 +46,14 @@ static int run_program(char *name)
        switch (pid) {
        case 0:
                /* child */
        switch (pid) {
        case 0:
                /* child */

+               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);

                execv(name, main_argv);
                dbg("exec of child failed");
                exit(1);
                execv(name, main_argv);
                dbg("exec of child failed");
                exit(1);


@@ -61,23 +74,45 @@ static int run_program(char *name)
  *     subsystem/
  *     default/
  */
  *     subsystem/
  *     default/
  */

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

 {
        char dirname[256];
 {
        char dirname[256];

-       char devname[NAME_SIZE];
+       char env_devname[NAME_SIZE];
+       char *devname;
+       char *temp;

 
        if (udev_dev_d == 0)
                return;
 
 
        if (udev_dev_d == 0)
                return;
 

+       memset(env_devname, 0x00, sizeof(env_devname));

        if (dev->type == 'b' || dev->type == 'c') {
        if (dev->type == 'b' || dev->type == 'c') {

-               strfieldcpy(devname, udev_root);
-               strfieldcat(devname, dev->name);
+               strfieldcpy(env_devname, udev_root);
+               strfieldcat(env_devname, dev->name);

        } else if (dev->type == 'n') {
        } else if (dev->type == 'n') {

-               strfieldcpy(devname, dev->name);
+               strfieldcpy(env_devname, dev->name);

                setenv("DEVPATH", devpath, 1);
        }
                setenv("DEVPATH", devpath, 1);
        }

-       setenv("DEVNAME", devname, 1);
-       dbg("DEVNAME='%s'", devname);
+       setenv("DEVNAME", env_devname, 1);
+       dbg("DEVNAME='%s'", env_devname);
+
+       devname = strdup(dev->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, '/');
+       }

 
        strcpy(dirname, DEVD_DIR);
        strfieldcat(dirname, dev->name);
 
        strcpy(dirname, DEVD_DIR);
        strfieldcat(dirname, dev->name);