[PATCH] Remove Debian permission files as the Debian maintainer doesn't seem to want...

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 9db63ed93e536111266fcf694d3cdd00aff4e5da..dcd460bedcee56c3dc5aefa272d6ef94705c49d6 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -34,7 +34,6 @@
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 static int delete_path(char *path)
 {
@@ -52,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;
@@ -67,37 +68,53 @@ 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);
 
        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) {
+       if (dev->symlink[0] != '\0') {
                symlinks = dev->symlink;
                while (1) {
                        linkname = strsep(&symlinks, " ");
                        if (linkname == NULL)
                                break;
 
-                       strncpy(filename, udev_root, sizeof(filename));
-                       strncat(filename, linkname, sizeof(filename));
+                       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));
@@ -131,7 +148,7 @@ int udev_remove_device(char *path, char *subsystem)
                temp = strrchr(path, '/');
                if (temp == NULL)
                        return -ENODEV;
-               strncpy(dev.name, &temp[1], sizeof(dev.name));
+               strfieldcpy(dev.name, &temp[1]);
        }
 
        dbg("name is '%s'", dev.name);