X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dev_d.c;h=be85f527759d1d838040165fdfd13d4c9cf4f64e;hb=a9ce6041228c12aad06666904af8dbe3acfd3115;hp=0910e4d323e344246b590f93d7a4799355645ff6;hpb=bbbe503ec1a5623a5a8abd003f46fdd8c3581054;p=elogind.git

diff --git a/dev_d.c b/dev_d.c
index 0910e4d32..be85f5277 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -11,8 +11,8 @@
 /*
  * This essentially emulates the following shell script logic in C:
  *	DIR="/etc/dev.d"
- *	export DEVNODE="whatever_dev_name_udev_just_gave"
- *	for I in "${DIR}/$DEVNODE/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
+ *	export DEVNAME="whatever_dev_name_udev_just_gave"
+ *	for I in "${DIR}/$DEVNAME/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
  *		if [ -f $I ]; then $I $1 ; fi
  *	done
  *	exit 1;
@@ -23,9 +23,13 @@
 #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 "udevdb.h"
 #include "logging.h"
 
 #define DEVD_DIR			"/etc/dev.d/"
@@ -34,6 +38,8 @@
 static int run_program(char *name)
 {
 	pid_t pid;
+	int fd;
+	char *argv[3];
 
 	dbg("running %s", name);
 
@@ -41,9 +47,22 @@ static int run_program(char *name)
 	switch (pid) {
 	case 0:
 		/* child */
-		execv(name, main_argv);
+		udevdb_exit();  /* close udevdb */
+		fd = open("/dev/null", O_RDWR);
+		if ( fd >= 0) {
+			dup2(fd, STDOUT_FILENO);
+			dup2(fd, STDIN_FILENO);
+			dup2(fd, STDERR_FILENO);
+		}
+		close(fd);
+
+		argv[0] = name;
+		argv[1] = main_argv[1];
+		argv[2] = NULL;
+
+		execv(name, argv);
 		dbg("exec of child failed");
-		exit(1);
+		_exit(1);
 	case -1:
 		dbg("fork of child failed");
 		break;
@@ -61,30 +80,45 @@ static int run_program(char *name)
  * 	subsystem/
  * 	default/
  */
-void dev_d_send(struct udevice *dev, char *subsystem)
+void dev_d_execute(struct udevice *udev)
 {
-	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);
+	/* 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 '/' */
+	temp = strchr(devname, '/');
+	while (temp != NULL) {
+		temp[0] = '\0';
+		strcpy(dirname, DEVD_DIR);
+		strfieldcat(dirname, devname);
+		call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+
+		temp[0] = '/';
+		++temp;
+		temp = strchr(temp, '/');
 	}
-	setenv("DEVNODE", devname, 1); /* FIXME: bad name for netif */
-	setenv("DEVNAME", devname, 1);
-	dbg("DEVNAME='%s'", devname);
 
 	strcpy(dirname, DEVD_DIR);
-	strfieldcat(dirname, dev->name);
+	strfieldcat(dirname, udev->name);
 	call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
 	strcpy(dirname, DEVD_DIR);
-	strfieldcat(dirname, subsystem);
+	strfieldcat(dirname, udev->subsystem);
 	call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
 	strcpy(dirname, DEVD_DIR "default");