[PATCH] tweak the config file generation portion of the Makefile a bit.

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index d42ed4be78033198adfb598268fb1fb065af58a3..0886c23343e0a7ee98fe8539cd130ff6783034ed 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -30,6 +30,7 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -65,6 +66,8 @@ 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));
@@ -83,17 +86,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);
+                       }
                }
        }
 
@@ -122,5 +133,8 @@ int udev_remove_device(char *path, char *subsystem)
 
        dbg("name is '%s'", dev->name);
        udevdb_delete_dev(path);
+
+       sysbus_send_remove(name, path);
+
        return delete_node(dev);
 }