chiark / gitweb /
[PATCH] add /etc/dev.d/ support for udev add and remove events.
[elogind.git] / udev-remove.c
index d42ed4b..dc6fcfc 100644 (file)
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.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)
 {
@@ -50,6 +52,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 +68,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));
@@ -107,20 +132,27 @@ 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));
+               strfieldcpy(dev.name, &temp[1]);
        }
 
-       dbg("name is '%s'", dev->name);
+       dbg("name is '%s'", dev.name);
        udevdb_delete_dev(path);
-       return delete_node(dev);
+
+       dev_d_send(&dev, subsystem);
+       sysbus_send_remove(dev.name, path);
+
+       retval = delete_node(&dev);
+       return retval;
 }