[PATCH] remove udev_dbus.h from Makefile

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 307b907c8897be44a99122adbeca131c8e05e1b8..41636b684e265120897e4233658feb4120b3de22 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,10 +29,11 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 static int delete_path(char *path)
 {
@@ -50,6 +51,8 @@ static int delete_path(char *path)
 
                /* remove if empty */
                retval = rmdir(path);
+               if (errno == ENOENT)
+                       retval = 0;
                if (retval) {
                        if (errno == ENOTEMPTY)
                                return 0;
@@ -64,29 +67,50 @@ static int delete_path(char *path)
 
 static int delete_node(struct udevice *dev)
 {
-       char filename[255];
+       char filename[NAME_SIZE];
+       char linkname[NAME_SIZE];
+       char partitionname[NAME_SIZE];
        int retval;
+       int i;
+       char *pos;
+       int len;
 
-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, dev->name, sizeof(filename));
+       strfieldcpy(filename, udev_root);
+       strfieldcat(filename, dev->name);
 
-       dbg("unlinking node '%s'", filename);
+       info("removing device node '%s'", filename);
        retval = unlink(filename);
+       if (errno == ENOENT)
+               retval = 0;
        if (retval) {
                dbg("unlink(%s) failed with error '%s'",
                        filename, strerror(errno));
                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++) {
+                       strfieldcpy(partitionname, filename);
+                       strintcat(partitionname, i);
+                       unlink(partitionname);
+               }
+       }
+
        /* remove subdirectories */
        if (strchr(dev->name, '/'))
                delete_path(filename);
 
-       if (*dev->symlink) {
-               strncpy(filename, udev_root, sizeof(filename));
-               strncat(filename, dev->symlink, sizeof(filename));
+       foreach_strpart(dev->symlink, " ", pos, len) {
+               strfieldcpymax(linkname, pos, len+1);
+               strfieldcpy(filename, udev_root);
+               strfieldcat(filename, linkname);
+
                dbg("unlinking symlink '%s'", filename);
                retval = unlink(filename);
+               if (errno == ENOENT)
+                       retval = 0;
                if (retval) {
                        dbg("unlink(%s) failed with error '%s'",
                                filename, strerror(errno));
@@ -100,42 +124,6 @@ static int delete_node(struct udevice *dev)
        return retval;
 }
 
-#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 void sysbus_send_remove(const char* name, const char *path)
-{
-        char filename[255];
-        DBusMessage* message;
-        DBusMessageIter iter;
-
-        if (sysbus_connection == NULL)
-                return;
-
-        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);
-
-        dbus_connection_flush(sysbus_connection);
-}
-#endif /* USE_DBUS */
-
 /*
  * 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
@@ -143,25 +131,26 @@ static void sysbus_send_remove(const char* name, const char *path)
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-       char name[100];
-       struct udevice *dev;
+       struct udevice dev;
        char *temp;
+       int retval;
+
+       memset(&dev, 0, sizeof(dev));
 
-       dev = udevdb_get_dev(path);
-       if (dev == NULL) {
+       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));
+               strfieldcpy(dev.name, &temp[1]);
        }
 
-       dbg("name is '%s'", dev->name);
+       dbg("name is '%s'", dev.name);
        udevdb_delete_dev(path);
 
-#ifdef USE_DBUS
-       sysbus_send_remove(name, device);
-#endif /* USE_DBUS */
-  
-       return delete_node(dev);
+       dev_d_send(&dev, subsystem);
+
+       retval = delete_node(&dev);
+       return retval;
 }