X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=98c45d6c333650ff4ebb381ad6508e49568cad7b;hb=e5a2989efbae81f40b60885a8f92ea1f87df7ea9;hp=c5de6c823fc8d938a2eb35e55c4da22126b588ac;hpb=808423c90c113294c09faafafebdf4556a093e80;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index c5de6c823..98c45d6c3 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,11 +29,11 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 static int delete_path(char *path)
 {
@@ -51,6 +51,8 @@ static int delete_path(char *path)
 
 		/* remove if empty */
 		retval = rmdir(path);
+		if (errno == ENOENT)
+			retval = 0;
 		if (retval) {
 			if (errno == ENOTEMPTY)
 				return 0;
@@ -65,46 +67,57 @@ static int delete_path(char *path)
 
 static int delete_node(struct udevice *dev)
 {
-	char filename[255];
-	char *symlinks;
-	char *linkname;
+	char filename[NAME_SIZE];
+	char linkname[NAME_SIZE];
+	char partitionname[NAME_SIZE];
 	int retval;
+	int i;
+	char *pos;
+	int len;
 
-	strncpy(filename, udev_root, sizeof(filename));
-	strncat(filename, dev->name, sizeof(filename));
+	strfieldcpy(filename, udev_root);
+	strfieldcat(filename, dev->name);
 
-	dbg("unlinking node '%s'", filename);
+	info("removing device node '%s'", filename);
 	retval = unlink(filename);
+	if (errno == ENOENT)
+		retval = 0;
 	if (retval) {
 		dbg("unlink(%s) failed with error '%s'",
 			filename, strerror(errno));
 		return retval;
 	}
 
+	/* remove partition nodes */
+	if (dev->partitions > 0) {
+		info("removing partitions '%s[1-%i]'", filename, dev->partitions);
+		for (i = 1; i <= dev->partitions; i++) {
+			strfieldcpy(partitionname, filename);
+			strintcat(partitionname, i);
+			unlink(partitionname);
+		}
+	}
+
 	/* remove subdirectories */
 	if (strchr(dev->name, '/'))
 		delete_path(filename);
 
-	if (*dev->symlink) {
-		symlinks = dev->symlink;
-		while (1) {
-			linkname = strsep(&symlinks, " ");
-			if (linkname == NULL)
-				break;
-
-			strncpy(filename, udev_root, sizeof(filename));
-			strncat(filename, linkname, sizeof(filename));
-
-			dbg("unlinking symlink '%s'", filename);
-			retval = unlink(filename);
-			if (retval) {
-				dbg("unlink(%s) failed with error '%s'",
-					filename, strerror(errno));
-				return retval;
-			}
-			if (strchr(dev->symlink, '/')) {
-				delete_path(filename);
-			}
+	foreach_strpart(dev->symlink, " ", pos, len) {
+		strfieldcpymax(linkname, pos, len+1);
+		strfieldcpy(filename, udev_root);
+		strfieldcat(filename, linkname);
+
+		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(dev->symlink, '/')) {
+			delete_path(filename);
 		}
 	}
 
@@ -122,22 +135,38 @@ int udev_remove_device(char *path, char *subsystem)
 	char *temp;
 	int retval;
 
-	memset(&dev, 0, sizeof(dev));
+	memset(&dev, 0x00, sizeof(dev));
 
-	retval = udevdb_get_dev(path, &dev);
-	if (retval) {
-		dbg("'%s' not found in database, falling back on default name", path);
-		temp = strrchr(path, '/');
-		if (temp == NULL)
-			return -ENODEV;
-		strncpy(dev.name, &temp[1], sizeof(dev.name));
-	}
+	dev.type = get_device_type(path, subsystem);
+
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = udevdb_get_dev(path, &dev);
+		if (retval) {
+			dbg("'%s' not found in database, falling back on default name", path);
+			temp = strrchr(path, '/');
+			if (temp == NULL)
+				return -ENODEV;
+			strfieldcpy(dev.name, &temp[1]);
+		}
 
-	dbg("name is '%s'", dev.name);
-	udevdb_delete_dev(path);
+		dbg("name='%s'", dev.name);
+		udevdb_delete_dev(path);
 
-	sysbus_send_remove(dev.name, path);
+		dev_d_send(&dev, subsystem);
+
+		retval = delete_node(&dev);
+		break;
+
+	case 'n':
+		retval = 0;
+		break;
+
+	default:
+		dbg("unknown device type '%c'", dev.type);
+		retval = -EINVAL;
+	}
 
-	retval = delete_node(&dev);
 	return retval;
 }