[PATCH] remove PLACE key match

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index e1af3dbef61cf3a0d34a67af13e972eb31dd5c2a..1fd36d24c5f93e5037be42311134c6ba9a1082f7 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
@@ -69,16 +70,25 @@ static int delete_path(const char *path)
 
 static int delete_node(struct udevice *udev)
 {
-       char filename[NAME_SIZE];
-       char partitionname[NAME_SIZE];
+       char filename[PATH_SIZE];
+       char partitionname[PATH_SIZE];
+       struct name_entry *name_loop;
+       struct stat stats;
        int retval;
        int i;
-       char *pos;
-       int len;
        int num;
 
-       snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
-       filename[NAME_SIZE-1] = '\0';
+       snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
+       filename[sizeof(filename)-1] = '\0';
+
+       dbg("checking major/minor of device node '%s'", filename);
+       if (stat(filename, &stats) != 0)
+               return -1;
+
+       if (udev->devt && stats.st_rdev != udev->devt) {
+               info("device node '%s' points to a different device, skip removal", filename);
+               return -1;
+       }
 
        info("removing device node '%s'", filename);
        retval = unlink_secure(filename);
@@ -89,13 +99,13 @@ static int delete_node(struct udevice *udev)
        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);
-               if (num > PARTITIONS_COUNT) {
+               if (num > 255) {
                        info("garbage from udev database, skip all_partitions removal");
                        return -1;
                }
                for (i = 1; i <= num; i++) {
-                       strfieldcpy(partitionname, filename);
-                       strintcat(partitionname, i);
+                       snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
+                       partitionname[sizeof(partitionname)-1] = '\0';
                        unlink_secure(partitionname);
                }
        }
@@ -104,12 +114,9 @@ static int delete_node(struct udevice *udev)
        if (strchr(udev->name, '/'))
                delete_path(filename);
 
-       foreach_strpart(udev->symlink, " ", pos, len) {
-               char linkname[NAME_SIZE];
-
-               strfieldcpymax(linkname, pos, len+1);
-               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
-               filename[NAME_SIZE-1] = '\0';
+       list_for_each_entry(name_loop, &udev->symlink_list, node) {
+               snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+               filename[sizeof(filename)-1] = '\0';
 
                dbg("unlinking symlink '%s'", filename);
                retval = unlink(filename);
@@ -120,7 +127,7 @@ static int delete_node(struct udevice *udev)
                                filename, strerror(errno));
                        return retval;
                }
-               if (strchr(udev->symlink, '/')) {
+               if (strchr(filename, '/')) {
                        delete_path(filename);
                }
        }
@@ -135,31 +142,29 @@ static int delete_node(struct udevice *udev)
 int udev_remove_device(struct udevice *udev)
 {
        const char *temp;
-       int retval;
 
-       if (udev->type != 'b' && udev->type != 'c')
+       if (udev->type != BLOCK && udev->type != CLASS)
                return 0;
 
-       retval = udev_db_get_device(udev);
-       if (retval) {
+       if (udev_db_get_device(udev, udev->devpath) == 0) {
+               if (udev->ignore_remove) {
+                       dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+                       return 0;
+               }
+               dbg("remove name='%s'", udev->name);
+               udev_db_delete_device(udev);
+       } else {
                /* fall back to kernel name */
                temp = strrchr(udev->devpath, '/');
                if (temp == NULL)
                        return -ENODEV;
-               strfieldcpy(udev->name, &temp[1]);
+               strlcpy(udev->name, &temp[1], sizeof(udev->name));
                dbg("'%s' not found in database, falling back on default name", udev->name);
        }
 
-       if (udev->ignore_remove) {
-               dbg("remove event for '%s' requested to be ignored by rule", udev->name);
-               return 0;
-       }
-
-       dbg("remove name='%s'", udev->name);
-       udev_db_delete_device(udev);
-
        /* use full path to the environment */
-       snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
+       snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+       udev->devname[sizeof(udev->devname)-1] = '\0';
 
        return delete_node(udev);
 }