X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=f9592b4c701a93cf432e5cc2f8147b25ab92ec22;hp=4d1b9286a0884a4d13ddf1c850c831be51aaab6e;hb=fb6e4c28248cdeed30a1d3eb42aba477f0429472;hpb=53899a171ea862124b49c75b7511b7eb30742ef9

diff --git a/udev_remove.c b/udev_remove.c
index 4d1b9286a..f9592b4c7 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -32,41 +32,12 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "udev_db.h"
 #include "logging.h"
 
-static int delete_path(const char *path)
-{
-	char *pos;
-	int retval;
-
-	pos = strrchr(path, '/');
-	while (1) {
-		*pos = '\0';
-		pos = strrchr(path, '/');
-
-		/* don't remove the last one */
-		if ((pos == path) || (pos == NULL))
-			break;
-
-		/* remove if empty */
-		retval = rmdir(path);
-		if (errno == ENOENT)
-			retval = 0;
-		if (retval) {
-			if (errno == ENOTEMPTY)
-				return 0;
-			err("rmdir(%s) failed: %s", path, strerror(errno));
-			break;
-		}
-		dbg("removed '%s'", path);
-	}
-	return 0;
-}
-
 static int delete_node(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
+	char devname[PATH_SIZE];
 	char partitionname[PATH_SIZE];
 	struct name_entry *name_loop;
 	struct stat stats;
@@ -111,9 +82,9 @@ 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';
+	snprintf(devname, sizeof(devname), "%s/%s", udev_root, udev->name);
+	devname[sizeof(devname)-1] = '\0';
+	setenv("DEVNAME", devname, 1);
 
 	num = udev->partitions;
 	if (num > 0) {