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=c091f11c28726cc02d5a165bdecd38d7befad1da;hb=7a0643a93f53cd5e7a05ae3d0c384e9e3160a94f;hpb=6e3e3c3416864eca74cb885f64c453eb531eed63

diff --git a/dev_d.c b/dev_d.c
index c091f11c2..d14c70c25 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -29,24 +29,20 @@
 
 #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(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 */
-		udevdb_exit();  /* close udevdb */
 		fd = open("/dev/null", O_RDWR);
 		if ( fd >= 0) {
 			dup2(fd, STDOUT_FILENO);
@@ -54,15 +50,16 @@ static int run_program(char *name)
 			dup2(fd, STDERR_FILENO);
 		}
 		close(fd);
-		execv(name, main_argv);
+
+		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;
@@ -74,54 +71,40 @@ static int run_program(char *name)
  * 	subsystem/
  * 	default/
  */
-void dev_d_send(struct udevice *dev, const char *subsystem, const char *devpath)
+void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix)
 {
-	char dirname[256];
-	char env_devname[NAME_SIZE];
-	char *devname;
+	char dirname[PATH_MAX];
+	char devname[NAME_SIZE];
 	char *temp;
 
+	/* skip if UDEV_NO_DEVD is set */
 	if (udev_dev_d == 0)
 		return;
 
-	memset(env_devname, 0x00, sizeof(env_devname));
-	if (dev->type == 'b' || dev->type == 'c') {
-		strfieldcpy(env_devname, udev_root);
-		strfieldcat(env_devname, dev->name);
-	} else if (dev->type == 'n') {
-		strfieldcpy(env_devname, dev->name);
-		setenv("DEVPATH", devpath, 1);
-	}
-	setenv("DEVNAME", env_devname, 1);
-	dbg("DEVNAME='%s'", env_devname);
-
-	devname = strdup(dev->name);
-	if (!devname) {
-		dbg("out of memory");
-		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 = 0x00;
-		strcpy(dirname, DEVD_DIR);
-		strfieldcat(dirname, devname);
-		call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+		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 = '/';
+		temp[0] = '/';
 		++temp;
 		temp = strchr(temp, '/');
 	}
 
-	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);
 }