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=baafdea51ae9020e67161c702709e33b432cb734;hb=afe9f2fb5fe97281e2e84c12e1451a8e9bab6edb;hpb=1cec1c241600fc11121f9504bc9e95836c03bd9c

diff --git a/udev_remove.c b/udev_remove.c
index baafdea51..6de6cf596 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
@@ -31,61 +29,56 @@
 #include <sys/stat.h>
 
 #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[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;
-	char *pos;
-	int len;
 	int num;
 
-	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
-	filename[NAME_SIZE-1] = '\0';
+	if (!list_empty(&udev->symlink_list)) {
+		char symlinks[512] = "";
 
-	dbg("checking major/minor of device node '%s'", filename);
-	if (stat(filename, &stats) != 0)
-		return -1;
+		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);
+
+			if (strchr(filename, '/'))
+				delete_path(filename);
+
+			strlcat(symlinks, filename, sizeof(symlinks));
+			strlcat(symlinks, " ", sizeof(symlinks));
+		}
+
+		remove_trailing_chars(symlinks, ' ');
+		if (symlinks[0] != '\0')
+			setenv("DEVLINKS", symlinks, 1);
+	}
 
-	if (udev->major && stats.st_rdev != makedev(udev->major, udev->minor)) {
+	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;
 	}
@@ -95,7 +88,8 @@ static int delete_node(struct udevice *udev)
 	if (retval)
 		return retval;
 
-	/* remove all_partitions nodes */
+	setenv("DEVNAME", filename, 1);
+
 	num = udev->partitions;
 	if (num > 0) {
 		info("removing all_partitions '%s[1-%i]'", filename, num);
@@ -104,37 +98,15 @@ static int delete_node(struct udevice *udev)
 			return -1;
 		}
 		for (i = 1; i <= num; i++) {
-			strfieldcpy(partitionname, filename);
-			strintcat(partitionname, i);
+			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);
 
-	foreach_strpart(udev->symlink, " ", pos, len) {
-		char linkname[NAME_SIZE];
-
-		strfieldcpymax(linkname, pos, len+1);
-		snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
-		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(udev->symlink, '/')) {
-			delete_path(filename);
-		}
-	}
-
 	return retval;
 }
 
@@ -144,32 +116,20 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-	const char *temp;
-	int retval;
-
-	if (udev->type != 'b' && udev->type != 'c')
+	if (major(udev->devt) == 0)
 		return 0;
 
-	retval = udev_db_get_device(udev);
-	if (retval) {
-		/* 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);
-	}
-
-	if (udev->ignore_remove) {
-		dbg("remove event for '%s' requested to be ignored by rule", udev->name);
-		return 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;
+		}
+		dbg("remove name='%s'", udev->name);
+		udev_db_delete_device(udev);
+	} else {
+		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));
 	}
 
-	dbg("remove name='%s'", udev->name);
-	udev_db_delete_device(udev);
-
-	/* use full path to the environment */
-	snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
-
 	return delete_node(udev);
 }