X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dev_d.c;h=d14c70c256d31a526e5f42b61d490eb61a94f632;hb=2092fbcdebf5313f29b43bdaa57a22baf0c0269f;hp=81c70133159203970bba27ff074e0486004a580b;hpb=4b06c852cb7da274b50f665a75367f901d8064ae;p=elogind.git

diff --git a/dev_d.c b/dev_d.c
index 81c701331..d14c70c25 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -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, char *devpath)
+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);
-		setenv("DEVPATH", devpath, 1);
+	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("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);
 }