X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-remove.c;h=9db63ed93e536111266fcf694d3cdd00aff4e5da;hp=9862a6f201baf757cfb91b345dcde8dfef2383f8;hb=74c73ef994f3ea8d013c33fe7be73e0c0c86977b;hpb=ca9998602336f67eb2590819eecf416977885e2a

diff --git a/udev-remove.c b/udev-remove.c
index 9862a6f20..9db63ed93 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -30,66 +30,115 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
-
-/*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device.  But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
- */
-static char *get_name(char *dev, int major, int minor)
+static int delete_path(char *path)
 {
-	static char name[100];
-	char *temp;
+	char *pos;
+	int retval;
 
-	temp = udevdb_get_udevice_by_sysfs(dev);
-	dbg("udevdb_get_udevice_by_sysfs returned %s", temp);
-	if (temp != NULL)
-		return temp;
-	
-	temp = strrchr(dev, '/');
-	if (temp == NULL)
-		return NULL;
-	strncpy(name, &temp[1], sizeof(name));
+	pos = strrchr(path, '/');
+	while (1) {
+		*pos = '\0';
+		pos = strrchr(path, '/');
 
-	dbg("name is %s", name);
+		/* don't remove the last one */
+		if ((pos == path) || (pos == NULL))
+			break;
 
-	return &name[0];
+		/* remove if empty */
+		retval = rmdir(path);
+		if (retval) {
+			if (errno == ENOTEMPTY)
+				return 0;
+			dbg("rmdir(%s) failed with error '%s'",
+			    path, strerror(errno));
+			break;
+		}
+		dbg("removed '%s'", path);
+	}
+	return 0;
 }
 
-/*
- * We also want to clean up any symlinks that were created in create_node()
- */
-static int delete_node(char *name)
+static int delete_node(struct udevice *dev)
 {
 	char filename[255];
+	char *symlinks;
+	char *linkname;
+	int retval;
+
+	strncpy(filename, udev_root, sizeof(filename));
+	strncat(filename, dev->name, sizeof(filename));
+
+	info("removing device node '%s'", filename);
+	retval = unlink(filename);
+	if (retval) {
+		dbg("unlink(%s) failed with error '%s'",
+			filename, strerror(errno));
+		return retval;
+	}
 
-	strncpy(filename, UDEV_ROOT, sizeof(filename));
-	strncat(filename, name, sizeof(filename));
+	/* remove subdirectories */
+	if (strchr(dev->name, '/'))
+		delete_path(filename);
 
-	dbg("unlinking %s", filename);
-	return unlink(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);
+			}
+		}
+	}
+
+	return retval;
 }
 
-int udev_remove_device(char *device, char *subsystem)
+/*
+ * Look up the sysfs path in the database to see if we have named this device
+ * something different from the kernel name.  If we have, us it.  If not, use
+ * the default kernel name for lack of anything else to know to do.
+ */
+int udev_remove_device(char *path, char *subsystem)
 {
-	char *name;
-	int retval = 0;
-
-	name = get_name(device, 0, 0);
-	if (name == NULL) {
-		dbg ("get_name failed");
-		retval = -ENODEV;
-		goto exit;
+	struct udevice dev;
+	char *temp;
+	int retval;
+
+	memset(&dev, 0, 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));
 	}
 
-	udevdb_delete_udevice(name);
+	dbg("name is '%s'", dev.name);
+	udevdb_delete_dev(path);
 
-	return delete_node(name);
+	sysbus_send_remove(dev.name, path);
 
-exit:
+	retval = delete_node(&dev);
 	return retval;
 }