[PATCH] D-BUS patch for udev-008

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 29063efb0de0c8c0ac5ffbc2322a178a7e8cadcc..307b907c8897be44a99122adbeca131c8e05e1b8 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -34,57 +34,134 @@
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
+static int delete_path(char *path)
+{
+       char *pos;
+       int retval;
 
-/*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device.  But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
- */
-static char *get_name(char *dev, int major, int minor)
+       pos = strrchr(path, '/');
+       while (1) {
+               *pos = '\0';
+               pos = strrchr(path, '/');
+
+               /* don't remove the last one */
+               if ((pos == path) || (pos == NULL))
+                       break;
+
+               /* remove if empty */
+               retval = rmdir(path);
+               if (retval) {
+                       if (errno == ENOTEMPTY)
+                               return 0;
+                       dbg("rmdir(%s) failed with error '%s'",
+                           path, strerror(errno));
+                       break;
+               }
+               dbg("removed '%s'", path);
+       }
+       return 0;
+}
+
+static int delete_node(struct udevice *dev)
 {
-       static char name[100];
-       char *temp;
+       char filename[255];
+       int retval;
+
+       strncpy(filename, udev_root, sizeof(filename));
+       strncat(filename, dev->name, sizeof(filename));
+
+       dbg("unlinking node '%s'", filename);
+       retval = unlink(filename);
+       if (retval) {
+               dbg("unlink(%s) failed with error '%s'",
+                       filename, strerror(errno));
+               return retval;
+       }
 
-       temp = strrchr(dev, '/');
-       if (temp == NULL)
-               return NULL;
-       strncpy(name, &temp[1], sizeof(name));
+       /* remove subdirectories */
+       if (strchr(dev->name, '/'))
+               delete_path(filename);
 
-       dbg("name is %s", name);
+       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);
+               }
+       }
 
-       return &name[0];
+       return retval;
 }
 
-/*
- * We also want to clean up any symlinks that were created in create_node()
+#ifdef USE_DBUS
+/** Send out a signal that a device node is deleted
+ *
+ *  @param  name                Name of the device node, e.g. /udev/sda1
+ *  @param  path                Sysfs path of device
  */
-static int delete_node(char *name)
+static void sysbus_send_remove(const char* name, const char *path)
 {
-       char filename[255];
+        char filename[255];
+        DBusMessage* message;
+        DBusMessageIter iter;
+
+        if (sysbus_connection == NULL)
+                return;
+
+        strncpy(filename, udev_root, sizeof(filename));
+        strncat(filename, name, sizeof(filename));
 
-       strncpy(filename, UDEV_ROOT, sizeof(filename));
-       strncat(filename, name, sizeof(filename));
+        /* object, interface, member */
+        message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor", 
+                                          "org.kernel.udev.NodeMonitor",
+                                          "NodeDeleted");
+        
+        dbus_message_iter_init(message, &iter);
+        dbus_message_iter_append_string(&iter, filename);
+        dbus_message_iter_append_string(&iter, path);
+        
+        if ( !dbus_connection_send(sysbus_connection, message, NULL) )
+                dbg("error sending d-bus signal");
+        
+        dbus_message_unref(message);
 
-       dbg("unlinking %s", filename);
-       return unlink(filename);
+        dbus_connection_flush(sysbus_connection);
 }
+#endif /* USE_DBUS */
 
-int udev_remove_device(char *device, char *subsystem)
+/*
+ * Look up the sysfs path in the database to see if we have named this device
+ * something different from the kernel name.  If we have, us it.  If not, use
+ * the default kernel name for lack of anything else to know to do.
+ */
+int udev_remove_device(char *path, char *subsystem)
 {
-       char *name;
-       int retval = 0;
-
-       name = get_name(device, 0, 0);
-       if (name == NULL) {
-               dbg ("get_name failed");
-               retval = -ENODEV;
-               goto exit;
-       }
+       char name[100];
+       struct udevice *dev;
+       char *temp;
 
-       udevdb_delete_udevice(name);
+       dev = udevdb_get_dev(path);
+       if (dev == NULL) {
+               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));
+       }
 
-       return delete_node(name);
+       dbg("name is '%s'", dev->name);
+       udevdb_delete_dev(path);
 
-exit:
-       return retval;
+#ifdef USE_DBUS
+       sysbus_send_remove(name, device);
+#endif /* USE_DBUS */
+  
+       return delete_node(dev);
 }