keymap: Explain how to end the program

[elogind.git] / udev / udev-node.c

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 92634427f95ecceca96e9f27f4422164cf7b3a9c..0ceb1d5110b0642102a6b49e10eb8a807c8908d4 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -243,26 +243,20 @@ static const char *link_find_prioritized(struct udev_device *dev, bool add, cons
        for (;;) {
                struct udev_device *dev_db;
                struct dirent *dent;
-               int maj, min;
-               char type, type2;
-               dev_t devnum;
 
                dent = readdir(dir);
                if (dent == NULL || dent->d_name[0] == '\0')
                        break;
                if (dent->d_name[0] == '.')
                        continue;
-               if (sscanf(dent->d_name, "%c%i:%i", &type, &maj, &min) != 3)
-                       continue;
-               info(udev, "found '%c%i:%i' claiming '%s'\n", type, maj, min, stackdir);
-               devnum = makedev(maj, min);
+
+               info(udev, "found '%s' claiming '%s'\n", dent->d_name, stackdir);
 
                /* did we find ourself? */
-               type2 = strcmp(udev_device_get_subsystem(dev), "block") == 0 ? 'b' : 'c';
-               if (udev_device_get_devnum(dev) == devnum && type == type2)
+               if (strcmp(dent->d_name, udev_device_get_id_filename(dev)) == 0)
                        continue;
 
-               dev_db = udev_device_new_from_devnum(udev, type, devnum);
+               dev_db = udev_device_new_from_id_filename(udev, dent->d_name);
                if (dev_db != NULL) {
                        const char *devnode;
 
@@ -327,7 +321,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
                        err = util_create_path(udev, filename);
                        if (err != 0 && err != -ENOENT)
                                break;
-                       fd = open(filename, O_WRONLY|O_CREAT|O_NOFOLLOW, 0444);
+                       fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
                        if (fd >= 0)
                                close(fd);
                        else
@@ -369,6 +363,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
 int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 {
        struct udev *udev = udev_device_get_udev(dev);
+       char filename[UTIL_PATH_SIZE];
        struct udev_list_entry *list_entry;
        int err = 0;
 
@@ -382,6 +377,13 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
                goto exit;
        }
 
+       /* always add /dev/{block,char}/$major:$minor */
+       snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+                udev_get_dev_path(udev),
+                strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+                major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+       node_symlink(udev, udev_device_get_devnode(dev), filename);
+
        /* create/update symlinks, add symlinks to name index */
        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
                if (udev_list_entry_get_flags(list_entry))
@@ -401,6 +403,7 @@ int udev_node_remove(struct udev_device *dev)
        const char *devnode;
        struct stat stats;
        struct udev_device *dev_check;
+       char filename[UTIL_PATH_SIZE];
        int err = 0;
 
        /* remove/update symlinks, remove symlinks from name index */
@@ -434,6 +437,13 @@ int udev_node_remove(struct udev_device *dev)
        err = util_unlink_secure(udev, devnode);
        if (err == 0)
                util_delete_path(udev, devnode);
+
+       /* remove /dev/{block,char}/$major:$minor */
+       snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+                udev_get_dev_path(udev),
+                strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+                major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+       unlink(filename);
 out:
        return err;
 }