[PATCH] no error on enoent

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 666928f318fa7699062f75009f503179262a1ce0..dcd460bedcee56c3dc5aefa272d6ef94705c49d6 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -30,69 +30,132 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
-
-/*
- * 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.
- */
-static char *get_name(char *path, int major, int minor)
+static int delete_path(char *path)
 {
-       static char name[100];
-       struct udevice *dev;
-       char *temp;
+       char *pos;
+       int retval;
 
-       dev = udevdb_get_dev(path);
-       if (dev != NULL) {
-               strcpy(name, dev->name);
-               goto exit;
-       }
+       pos = strrchr(path, '/');
+       while (1) {
+               *pos = '\0';
+               pos = strrchr(path, '/');
 
-       dbg("%s not found in database, falling back on default name", path);
-       temp = strrchr(path, '/');
-       if (temp == NULL)
-               return NULL;
-       strncpy(name, &temp[1], sizeof(name));
+               /* don't remove the last one */
+               if ((pos == path) || (pos == NULL))
+                       break;
 
-exit:
-       dbg("name is %s", name);
-       return &name[0];
+               /* remove if empty */
+               retval = rmdir(path);
+               if (errno == ENOENT)
+                       retval = 0;
+               if (retval) {
+                       if (errno == ENOTEMPTY)
+                               return 0;
+                       dbg("rmdir(%s) failed with error '%s'",
+                           path, strerror(errno));
+                       break;
+               }
+               dbg("removed '%s'", path);
+       }
+       return 0;
 }
 
-/*
- * We also want to clean up any symlinks that were created in create_node()
- */
-static int delete_node(char *name)
+static int delete_node(struct udevice *dev)
 {
        char filename[255];
+       char partitionname[255];
+       char *symlinks;
+       char *linkname;
+       int retval;
+       int i;
+
+       strfieldcpy(filename, udev_root);
+       strfieldcat(filename, dev->name);
 
-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, name, sizeof(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);
+               }
+       }
 
-       dbg("unlinking %s", filename);
-       return unlink(filename);
+       /* remove subdirectories */
+       if (strchr(dev->name, '/'))
+               delete_path(filename);
+
+       if (dev->symlink[0] != '\0') {
+               symlinks = dev->symlink;
+               while (1) {
+                       linkname = strsep(&symlinks, " ");
+                       if (linkname == NULL)
+                               break;
+
+                       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));
+                               return retval;
+                       }
+                       if (strchr(dev->symlink, '/')) {
+                               delete_path(filename);
+                       }
+               }
+       }
+
+       return retval;
 }
 
-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;
+       struct udevice dev;
+       char *temp;
+       int retval;
+
+       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;
+               strfieldcpy(dev.name, &temp[1]);
        }
 
-       udevdb_delete_dev(device);
+       dbg("name is '%s'", dev.name);
+       udevdb_delete_dev(path);
 
-       return delete_node(name);
+       sysbus_send_remove(dev.name, path);
 
-exit:
+       retval = delete_node(&dev);
        return retval;
 }