[PATCH] misc code cleanups.

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 02c84371a45a5e1ba6712dc26dfec162fc128dba..9db63ed93e536111266fcf694d3cdd00aff4e5da 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -31,6 +31,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -66,12 +67,14 @@ static int delete_path(char *path)
 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));
 
-       dbg("unlinking node '%s'", filename);
+       info("removing device node '%s'", filename);
        retval = unlink(filename);
        if (retval) {
                dbg("unlink(%s) failed with error '%s'",
@@ -84,17 +87,25 @@ static int delete_node(struct udevice *dev)
                delete_path(filename);
 
        if (*dev->symlink) {
-               strncpy(filename, udev_root, sizeof(filename));
-               strncat(filename, dev->symlink, 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);
+               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);
+                       }
                }
        }
 
@@ -108,23 +119,26 @@ static int delete_node(struct udevice *dev)
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-       char name[100];
-       struct udevice *dev;
+       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;
-               strncpy(name, &temp[1], sizeof(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(name, path);
+       sysbus_send_remove(dev.name, path);
 
-       return delete_node(dev);
+       retval = delete_node(&dev);
+       return retval;
 }