[PATCH] install udevstart

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index c20c651dc53687056d701c0a8714a7f5d39f3b9b..dcd460bedcee56c3dc5aefa272d6ef94705c49d6 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -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;
@@ -72,11 +74,13 @@ static int delete_node(struct udevice *dev)
        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));
@@ -87,7 +91,8 @@ static int delete_node(struct udevice *dev)
        if (dev->partitions > 0) {
                info("removing partitions '%s[1-%i]'", filename, dev->partitions);
                for (i = 1; i <= dev->partitions; i++) {
-                       sprintf(partitionname, "%s%i", filename, i);
+                       strfieldcpy(partitionname, filename);
+                       strintcat(partitionname, i);
                        unlink(partitionname);
                }
        }
@@ -103,11 +108,13 @@ static int delete_node(struct udevice *dev)
                        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));
@@ -141,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);