[PATCH] v018 release

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index dad4a98570251f9a6cadacf8a05bac3fff722ece..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, " ");
@@ -118,25 +129,26 @@ static int delete_node(struct udevice *dev)
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-       struct udevice *dev;
-       struct udevice device;
+       struct udevice dev;
        char *temp;
+       int retval;
 
-       dev = udevdb_get_dev(path);
-       if (dev == NULL) {
+       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;
-               memset(&device, 0, sizeof(device));
-               dev = &device;
-               strncpy(device.name, &temp[1], sizeof(device.name));
+               strncpy(dev.name, &temp[1], sizeof(dev.name));
        }
 
-       dbg("name is '%s'", dev->name);
+       dbg("name is '%s'", dev.name);
        udevdb_delete_dev(path);
 
-       sysbus_send_remove(dev->name, path);
+       sysbus_send_remove(dev.name, path);
 
-       return delete_node(dev);
+       retval = delete_node(&dev);
+       return retval;
 }