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=c3a7880b496cb2a9d25554a5e5a59b92daef83c5;hb=fb6e4c28248cdeed30a1d3eb42aba477f0429472;hpb=08183c4b90505866e806d308213d0a2d293b2659

diff --git a/udev_remove.c b/udev_remove.c
index c3a7880b4..f9592b4c7 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -1,10 +1,8 @@
 /*
  * udev-remove.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -34,43 +32,12 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.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;
-			dbg("rmdir(%s) failed with error '%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;
@@ -91,7 +58,7 @@ static int delete_node(struct udevice *udev)
 			continue;;
 		}
 
-		dbg("removing symlink '%s'", filename);
+		info("removing symlink '%s'", filename);
 		unlink(filename);
 
 		if (strchr(filename, '/'))
@@ -115,6 +82,10 @@ static int delete_node(struct udevice *udev)
 	if (retval)
 		return retval;
 
+	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) {
 		info("removing all_partitions '%s[1-%i]'", filename, num);
@@ -141,9 +112,7 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-	const char *temp;
-
-	if (udev->type != BLOCK && udev->type != CLASS)
+	if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
 		return 0;
 
 	if (udev_db_get_device(udev, udev->devpath) == 0) {
@@ -154,17 +123,9 @@ int udev_remove_device(struct udevice *udev)
 		dbg("remove name='%s'", udev->name);
 		udev_db_delete_device(udev);
 	} else {
-		/* fall back to kernel name */
-		temp = strrchr(udev->devpath, '/');
-		if (temp == NULL)
-			return -ENODEV;
-		strlcpy(udev->name, &temp[1], sizeof(udev->name));
-		dbg("'%s' not found in database, falling back on default name", udev->name);
+		dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
+		strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
 	}
 
-	/* use full path to the environment */
-	snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
-	udev->devname[sizeof(udev->devname)-1] = '\0';
-
 	return delete_node(udev);
 }