X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=cff940ccfebfe7639a6e422a34b8c2129652a855;hp=7a6c032d01cbbf39c638c3489dce0e6932a64af8;hb=0599b4a25fdeffd7eb3acbd4c9783f40fa70f759;hpb=03fd7a3ad3438c7ae4525215ac58c3d94133cc35

diff --git a/udev_remove.c b/udev_remove.c
index 7a6c032d0..cff940ccf 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
@@ -30,10 +28,10 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
 #include "udev_db.h"
 #include "logging.h"
 
@@ -69,21 +67,41 @@ static int delete_path(const char *path)
 
 static int delete_node(struct udevice *udev)
 {
-	char filename[NAME_SIZE];
-	char partitionname[NAME_SIZE];
+	char filename[PATH_SIZE];
+	char partitionname[PATH_SIZE];
 	struct name_entry *name_loop;
 	struct stat stats;
 	int retval;
 	int i;
 	int num;
 
-	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
-	filename[NAME_SIZE-1] = '\0';
+	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';
 
-	dbg("checking major/minor of device node '%s'", filename);
-	if (stat(filename, &stats) != 0)
-		return -1;
+		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);
 
+		if (strchr(filename, '/'))
+			delete_path(filename);
+	}
+
+	snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
+	filename[sizeof(filename)-1] = '\0';
+
+	if (stat(filename, &stats) != 0) {
+		dbg("device node '%s' not found", filename);
+		return -1;
+	}
 	if (udev->devt && stats.st_rdev != udev->devt) {
 		info("device node '%s' points to a different device, skip removal", filename);
 		return -1;
@@ -94,7 +112,6 @@ static int delete_node(struct udevice *udev)
 	if (retval)
 		return retval;
 
-	/* remove all_partitions nodes */
 	num = udev->partitions;
 	if (num > 0) {
 		info("removing all_partitions '%s[1-%i]'", filename, num);
@@ -103,34 +120,15 @@ static int delete_node(struct udevice *udev)
 			return -1;
 		}
 		for (i = 1; i <= num; i++) {
-			snprintf(partitionname, NAME_SIZE, "%s%d", filename, i);
-			partitionname[NAME_SIZE-1] = '\0';
+			snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
+			partitionname[sizeof(partitionname)-1] = '\0';
 			unlink_secure(partitionname);
 		}
 	}
 
-	/* remove subdirectories */
 	if (strchr(udev->name, '/'))
 		delete_path(filename);
 
-	list_for_each_entry(name_loop, &udev->symlink_list, node) {
-		snprintf(filename, NAME_SIZE, "%s/%s", udev_root, name_loop->name);
-		filename[NAME_SIZE-1] = '\0';
-
-		dbg("unlinking symlink '%s'", filename);
-		retval = unlink(filename);
-		if (errno == ENOENT)
-			retval = 0;
-		if (retval) {
-			dbg("unlink(%s) failed with error '%s'",
-				filename, strerror(errno));
-			return retval;
-		}
-		if (strchr(filename, '/')) {
-			delete_path(filename);
-		}
-	}
-
 	return retval;
 }
 
@@ -140,9 +138,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) {
@@ -153,16 +149,12 @@ 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;
-		strfieldcpy(udev->name, &temp[1]);
-		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, NAME_SIZE, "%s/%s", udev_root, udev->name);
+	snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+	udev->devname[sizeof(udev->devname)-1] = '\0';
 
 	return delete_node(udev);
 }