udev(7) manpage: Fix description of $attr

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

diff --git a/udev/udev-node.c b/udev/udev-node.c
index ceb1d52ea7f7bf2c794696b057018ad5fd5e68d4..228b3ebee4d43f9fe4ed2be39bb7a3b3197b95ee 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -33,14 +33,13 @@
 
 #define TMP_FILE_EXT           ".udev-tmp"
 
-int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid)
+int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_t uid, gid_t gid)
 {
        struct udev *udev = udev_device_get_udev(dev);
+       dev_t devnum = udev_device_get_devnum(dev);
        struct stat stats;
        int err = 0;
 
-       if (major(devnum) == 0)
-               devnum = udev_device_get_devnum(dev);
 
        if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
                mode |= S_IFBLK;
@@ -73,22 +72,22 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
                        err = mknod(file_tmp, mode, devnum);
                        udev_selinux_resetfscreatecon(udev);
                        if (err != 0) {
-                               err(udev, "mknod(%s, %#o, %u, %u) failed: %m\n",
-                                   file_tmp, mode, major(devnum), minor(devnum));
+                               err(udev, "mknod '%s' %u:%u %#o failed: %m\n",
+                                   file_tmp, major(devnum), minor(devnum), mode);
                                goto exit;
                        }
                        err = rename(file_tmp, file);
                        if (err != 0) {
-                               err(udev, "rename(%s, %s) failed: %m\n", file_tmp, file);
+                               err(udev, "rename '%s' '%s' failed: %m\n", file_tmp, file);
                                unlink(file_tmp);
                                goto exit;
                        }
-                       info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+                       info(udev, "set permissions '%s' %#o uid=%u gid=%u\n", file, mode, uid, gid);
                        chmod(file, mode);
                        chown(file, uid, gid);
                }
        } else {
-               info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
+               info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode);
                do {
                        err = util_create_path(udev, file);
                        if (err != 0 && err != -ENOENT)
@@ -100,8 +99,8 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
                        udev_selinux_resetfscreatecon(udev);
                } while (err == -ENOENT);
                if (err != 0)
-                       err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
-               info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+                       err(udev, "mknod '%s' %u:%u %#o' failed: %m\n", file, major(devnum), minor(devnum), mode);
+               info(udev, "set permissions '%s' %#o uid=%u gid=%u\n", file, mode, uid, gid);
                chmod(file, mode);
                chown(file, uid, gid);
        }
@@ -163,8 +162,8 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                        int len;
 
                        dbg(udev, "found existing symlink '%s'\n", slink);
-                       len = readlink(slink, buf, sizeof(buf) - 1);
-                       if (len > 0) {
+                       len = readlink(slink, buf, sizeof(buf));
+                       if (len > 0 && len < (int)sizeof(buf)) {
                                buf[len] = '\0';
                                if (strcmp(target, buf) == 0) {
                                        info(udev, "preserve already existing symlink '%s' to '%s'\n",
@@ -205,12 +204,12 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                udev_selinux_resetfscreatecon(udev);
        } while (err == -ENOENT);
        if (err != 0) {
-               err(udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
+               err(udev, "symlink '%s' '%s' failed: %m\n", target, slink_tmp);
                goto exit;
        }
        err = rename(slink_tmp, slink);
        if (err != 0) {
-               err(udev, "rename(%s, %s) failed: %m\n", slink_tmp, slink);
+               err(udev, "rename '%s' '%s' failed: %m\n", slink_tmp, slink);
                unlink(slink_tmp);
        }
 exit:
@@ -299,15 +298,15 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
 
        if (!add) {
                dbg(udev, "removing index: '%s'\n", filename);
-               unlink(filename);
-               util_delete_path(udev, filename);
+               if (unlink(filename) == 0)
+                       rmdir(dirname);
        }
 
        target = link_find_prioritized(dev, add, dirname, buf, sizeof(buf));
        if (target == NULL) {
                info(udev, "no reference left, remove '%s'\n", slink);
-               unlink(slink);
-               util_delete_path(udev, slink);
+               if (unlink(slink) == 0)
+                       util_delete_path(udev, slink);
        } else {
                info(udev, "creating link '%s' to '%s'\n", slink, target);
                node_symlink(udev, target, slink);
@@ -373,7 +372,7 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
             major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
             mode, uid, gid);
 
-       if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
+       if (udev_node_mknod(dev, NULL, mode, uid, gid) != 0) {
                err = -1;
                goto exit;
        }
@@ -397,7 +396,6 @@ 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 */
@@ -427,15 +425,10 @@ int udev_node_remove(struct udev_device *dev)
                goto out;
        }
 
-       util_strscpyl(filename, sizeof(filename), LIBEXECDIR "/devices", &devnode[strlen(udev_get_dev_path(udev))], NULL);
-       if (stat(filename, &stats) == 0 || stats.st_rdev == udev_device_get_devnum(dev)) {
-               info(udev, "static device entry found '%s', skip removal\n", devnode);
-               goto out;
-       }
-
        info(udev, "removing device node '%s'\n", devnode);
        err = util_unlink_secure(udev, devnode);
-       util_delete_path(udev, devnode);
+       if (err == 0)
+               util_delete_path(udev, devnode);
 out:
        return err;
 }