X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=41636b684e265120897e4233658feb4120b3de22;hb=b658bc09a1ae34f57d7719ecad74caf571d5cdf8;hp=dcd460bedcee56c3dc5aefa272d6ef94705c49d6;hpb=92c5ddee382d06de63c10aa81a18255d0b789812;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index dcd460bed..41636b684 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,8 +29,8 @@
 #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"
@@ -67,12 +67,13 @@ static int delete_path(char *path)
 
 static int delete_node(struct udevice *dev)
 {
-	char filename[255];
-	char partitionname[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;
 
 	strfieldcpy(filename, udev_root);
 	strfieldcat(filename, dev->name);
@@ -101,28 +102,22 @@ static int delete_node(struct udevice *dev)
 	if (strchr(dev->name, '/'))
 		delete_path(filename);
 
-	if (dev->symlink[0] != '\0') {
-		symlinks = dev->symlink;
-		while (1) {
-			linkname = strsep(&symlinks, " ");
-			if (linkname == NULL)
-				break;
-
-			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);
-			}
+	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);
 		}
 	}
 
@@ -154,7 +149,7 @@ int udev_remove_device(char *path, char *subsystem)
 	dbg("name is '%s'", dev.name);
 	udevdb_delete_dev(path);
 
-	sysbus_send_remove(dev.name, path);
+	dev_d_send(&dev, subsystem);
 
 	retval = delete_node(&dev);
 	return retval;