[PATCH] fix up segfaulting binaries with new klibc

[elogind.git] / udev_multiplex.c

diff --git a/udev_multiplex.c b/udev_multiplex.c
index 7e3dc656d6d7d48edcb3ff284bb805c8409a0d26..6d7852dbc040e8e2783f866797528810bdb84b8a 100644 (file)
--- a/udev_multiplex.c
+++ b/udev_multiplex.c
@@ -31,11 +31,10 @@
 #include "udev_utils.h"
 #include "logging.h"
 
 #include "udev_utils.h"
 #include "logging.h"
 

-static int run_program(const char *filename, void *data)
+static int run_program(struct udevice *udev, const char *filename)

 {
        pid_t pid;
        int fd;
 {
        pid_t pid;
        int fd;

-       struct udevice *udev = data;

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


@@ -74,41 +73,43 @@ static int run_program(const char *filename, void *data)
 void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix)
 {
        char dirname[PATH_MAX];
 void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix)
 {
        char dirname[PATH_MAX];

-       char devname[NAME_SIZE];
-       char *temp;
-
-       /* skip if UDEV_NO_DEVD is set */
-       if (udev_dev_d == 0)
-               return;
-
-       strfieldcpy(devname, udev->name);

 
        /* chop the device name up into pieces based on '/' */
 
        /* 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, '/');
+       if (udev->name[0] != '\0') {
+               char devname[NAME_SIZE];
+               char *temp;
+
+               strfieldcpy(devname, udev->name);
+               temp = strchr(devname, '/');
+               while (temp != NULL) {
+                       temp[0] = '\0';
+
+                       /* don't call the subsystem directory here */
+                       if (strcmp(devname, udev->subsystem) != 0) {
+                               snprintf(dirname, PATH_MAX, "%s/%s", basedir, devname);
+                               dirname[PATH_MAX-1] = '\0';
+                               call_foreach_file(run_program, udev, dirname, suffix);
+                       }
+
+                       temp[0] = '/';
+                       ++temp;
+                       temp = strchr(temp, '/');
+               }

        }
 
        if (udev->name[0] != '\0') {
                snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->name);
                dirname[PATH_MAX-1] = '\0';
        }
 
        if (udev->name[0] != '\0') {
                snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->name);
                dirname[PATH_MAX-1] = '\0';

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

        }
 
        if (udev->subsystem[0] != '\0') {
                snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->subsystem);
                dirname[PATH_MAX-1] = '\0';
        }
 
        if (udev->subsystem[0] != '\0') {
                snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->subsystem);
                dirname[PATH_MAX-1] = '\0';

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

        }
 
        snprintf(dirname, PATH_MAX, "%s/default", basedir);
        dirname[PATH_MAX-1] = '\0';
        }
 
        snprintf(dirname, PATH_MAX, "%s/default", basedir);
        dirname[PATH_MAX-1] = '\0';

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

 }
 }