X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=dev_d.c;h=d14c70c256d31a526e5f42b61d490eb61a94f632;hp=1108c8cee40b8b68241dba4d9d9c2042d0384e8b;hb=7225821d631f37f3c2b11e1d62aeb516b2acec30;hpb=af4b05d4917fdfa55eff3d8d53a830464d8162a1

diff --git a/dev_d.c b/dev_d.c
index 1108c8cee..d14c70c25 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -29,12 +29,8 @@
 
 #include "udev.h"
 #include "udev_lib.h"
-#include "udevdb.h"
 #include "logging.h"
 
-#define DEVD_DIR			"/etc/dev.d/"
-#define DEVD_SUFFIX			".dev"
-
 static int run_program(const char *filename, void *data)
 {
 	pid_t pid;
@@ -75,7 +71,7 @@ static int run_program(const char *filename, void *data)
  * 	subsystem/
  * 	default/
  */
-void dev_d_execute(struct udevice *udev)
+void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix)
 {
 	char dirname[PATH_MAX];
 	char devname[NAME_SIZE];
@@ -85,37 +81,30 @@ void dev_d_execute(struct udevice *udev)
 	if (udev_dev_d == 0)
 		return;
 
-	/* 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 '/' */
+	/* 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);
+		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, '/');
 	}
 
-	strcpy(dirname, DEVD_DIR);
-	strfieldcat(dirname, udev->name);
-	call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
+	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, udev->subsystem);
-	call_foreach_file(run_program, dirname, DEVD_SUFFIX, udev);
+	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, udev);
+	snprintf(dirname, PATH_MAX, "%s/default", basedir);
+	dirname[PATH_MAX-1] = '\0';
+	call_foreach_file(run_program, dirname, suffix, udev);
 }