X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=6de6cf5962dab074df530a934dc4211f510031f3;hp=6efa17eb7c7957cf4aaf6f97e7d2b4e7cf2245f8;hb=79102489260da9f577d7c1fb3665dd95d1596bea;hpb=0da0efb2b622435209d183b49e2d16d426142b2c

diff --git a/udev_remove.c b/udev_remove.c
index 6efa17eb7..6de6cf596 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -28,11 +28,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
 
 static int delete_node(struct udevice *udev)
 {
@@ -44,24 +40,35 @@ static int delete_node(struct udevice *udev)
 	int i;
 	int num;
 
-	list_for_each_entry(name_loop, &udev->symlink_list, node) {
-		snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
-		filename[sizeof(filename)-1] = '\0';
+	if (!list_empty(&udev->symlink_list)) {
+		char symlinks[512] = "";
 
-		if (stat(filename, &stats) != 0) {
-			dbg("symlink '%s' not found", filename);
-			continue;
-		}
-		if (udev->devt && stats.st_rdev != udev->devt) {
-			info("symlink '%s' points to a different device, skip removal", filename);
-			continue;;
-		}
+		list_for_each_entry(name_loop, &udev->symlink_list, node) {
+			snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+			filename[sizeof(filename)-1] = '\0';
+
+			if (stat(filename, &stats) != 0) {
+				dbg("symlink '%s' not found", filename);
+				continue;
+			}
+			if (udev->devt && stats.st_rdev != udev->devt) {
+				info("symlink '%s' points to a different device, skip removal", filename);
+				continue;
+			}
 
-		info("removing symlink '%s'", filename);
-		unlink(filename);
+			info("removing symlink '%s'", filename);
+			unlink(filename);
+
+			if (strchr(filename, '/'))
+				delete_path(filename);
+
+			strlcat(symlinks, filename, sizeof(symlinks));
+			strlcat(symlinks, " ", sizeof(symlinks));
+		}
 
-		if (strchr(filename, '/'))
-			delete_path(filename);
+		remove_trailing_chars(symlinks, ' ');
+		if (symlinks[0] != '\0')
+			setenv("DEVLINKS", symlinks, 1);
 	}
 
 	snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
@@ -81,9 +88,7 @@ static int delete_node(struct udevice *udev)
 	if (retval)
 		return retval;
 
-	/* export DEVNAME to the environment */
-	snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
-	udev->devname[sizeof(udev->devname)-1] = '\0';
+	setenv("DEVNAME", filename, 1);
 
 	num = udev->partitions;
 	if (num > 0) {
@@ -111,10 +116,10 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-	if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
+	if (major(udev->devt) == 0)
 		return 0;
 
-	if (udev_db_get_device(udev, udev->devpath) == 0) {
+	if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 		if (udev->ignore_remove) {
 			dbg("remove event for '%s' requested to be ignored by rule", udev->name);
 			return 0;
@@ -122,8 +127,8 @@ int udev_remove_device(struct udevice *udev)
 		dbg("remove name='%s'", udev->name);
 		udev_db_delete_device(udev);
 	} else {
-		dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
-		strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
+		dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel_name);
+		strlcpy(udev->name, udev->dev->kernel_name, sizeof(udev->name));
 	}
 
 	return delete_node(udev);