[PATCH] add a test and simplify debug statement

[elogind.git] / udev_multiplex.c

diff --git a/udev_multiplex.c b/udev_multiplex.c
index 3a484068ff76a849e806d251245ecbde4192acbe..3ef6e1707ac6b599af1dce0552d33a329f5ff787 100644 (file)
--- a/udev_multiplex.c
+++ b/udev_multiplex.c
@@ -28,14 +28,14 @@
 #include <fcntl.h>
 
 #include "udev.h"
+#include "udev_libc_wrapper.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;
-       struct udevice *udev = data;
 
        dbg("running %s", filename);
 
@@ -73,23 +73,23 @@ 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];
+       char dirname[PATH_SIZE];
 
        /* chop the device name up into pieces based on '/' */
        if (udev->name[0] != '\0') {
-               char devname[NAME_SIZE];
+               char devname[PATH_SIZE];
                char *temp;
 
-               strfieldcpy(devname, udev->name);
+               strlcpy(devname, udev->name, sizeof(devname));
                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, dirname, suffix, udev);
+                               snprintf(dirname, sizeof(dirname), "%s/%s", basedir, devname);
+                               dirname[sizeof(dirname)-1] = '\0';
+                               call_foreach_file(run_program, udev, dirname, suffix);
                        }
 
                        temp[0] = '/';
@@ -99,18 +99,18 @@ void udev_multiplex_directory(struct udevice *udev, const char *basedir, const c
        }
 
        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);
+               snprintf(dirname, sizeof(dirname), "%s/%s", basedir, udev->name);
+               dirname[sizeof(dirname)-1] = '\0';
+               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';
-               call_foreach_file(run_program, dirname, suffix, udev);
+               snprintf(dirname, sizeof(dirname), "%s/%s", basedir, udev->subsystem);
+               dirname[sizeof(dirname)-1] = '\0';
+               call_foreach_file(run_program, udev, dirname, suffix);
        }
 
-       snprintf(dirname, PATH_MAX, "%s/default", basedir);
-       dirname[PATH_MAX-1] = '\0';
-       call_foreach_file(run_program, dirname, suffix, udev);
+       snprintf(dirname, sizeof(dirname), "%s/default", basedir);
+       dirname[sizeof(dirname)-1] = '\0';
+       call_foreach_file(run_program, udev, dirname, suffix);
 }