[PATCH] v018 release

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index c5de6c823fc8d938a2eb35e55c4da22126b588ac..c20c651dc53687056d701c0a8714a7f5d39f3b9b 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -31,9 +31,9 @@
 #include "udev.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)
 {
@@ -66,14 +66,16 @@ static int delete_path(char *path)
 static int delete_node(struct udevice *dev)
 {
        char filename[255];
+       char partitionname[255];
        char *symlinks;
        char *linkname;
        int retval;
+       int i;
 
        strncpy(filename, udev_root, sizeof(filename));
        strncat(filename, dev->name, sizeof(filename));
 
-       dbg("unlinking node '%s'", filename);
+       info("removing device node '%s'", filename);
        retval = unlink(filename);
        if (retval) {
                dbg("unlink(%s) failed with error '%s'",
@@ -81,11 +83,20 @@ static int delete_node(struct udevice *dev)
                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++) {
+                       sprintf(partitionname, "%s%i", filename, i);
+                       unlink(partitionname);
+               }
+       }
+
        /* remove subdirectories */
        if (strchr(dev->name, '/'))
                delete_path(filename);
 
-       if (*dev->symlink) {
+       if (dev->symlink[0] != '\0') {
                symlinks = dev->symlink;
                while (1) {
                        linkname = strsep(&symlinks, " ");