X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dev_d.c;h=be85f527759d1d838040165fdfd13d4c9cf4f64e;hb=5d24c6ca364c6232efa626049b03d02c15ab5e85;hp=050df7bbec000440da61582156787425ed155f55;hpb=f35fb62819d017880d6008b65179a3528eaba623;p=elogind.git

diff --git a/dev_d.c b/dev_d.c
index 050df7bbe..be85f5277 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -62,7 +62,7 @@ static int run_program(char *name)
 
 		execv(name, argv);
 		dbg("exec of child failed");
-		exit(1);
+		_exit(1);
 	case -1:
 		dbg("fork of child failed");
 		break;
@@ -80,53 +80,45 @@ 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)
 {
-	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);
-	}
+	/* skip if udev did nothing, like unchanged netif or no "dev" file */
+	if (udev->devname[0] == '\0')
+		return;
 
-	setenv("DEVPATH", devpath, 1);
-	setenv("DEVNAME", env_devname, 1);
-	dbg("DEVNAME='%s'", env_devname);
+	/* add the node name or the netif name to the environment */
+	setenv("DEVNAME", udev->devname, 1);
+	dbg("DEVNAME='%s'", udev->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 '/' */
 	temp = strchr(devname, '/');
 	while (temp != NULL) {
-		*temp = 0x00;
+		temp[0] = '\0';
 		strcpy(dirname, DEVD_DIR);
 		strfieldcat(dirname, devname);
 		call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
-		*temp = '/';
+		temp[0] = '/';
 		++temp;
 		temp = strchr(temp, '/');
 	}
 
 	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");