[PATCH] no error on enoent

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 02c84371a45a5e1ba6712dc26dfec162fc128dba..dcd460bedcee56c3dc5aefa272d6ef94705c49d6 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -31,9 +31,9 @@
 #include "udev.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)
 {
@@ -51,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;
@@ -66,35 +68,61 @@ static int delete_path(char *path)
 static int delete_node(struct udevice *dev)
 {
        char filename[255];
+       char partitionname[255];
+       char *symlinks;
+       char *linkname;
        int retval;
+       int i;
 
-       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));
-               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);
+       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);
+                       }
                }
        }
 
@@ -108,23 +136,26 @@ 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;
+
+       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);
 
-       sysbus_send_remove(name, path);
+       sysbus_send_remove(dev.name, path);
 
-       return delete_node(dev);
+       retval = delete_node(&dev);
+       return retval;
 }