X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-node.c;h=1148a1529cd7ada01f28245c631e5ec616bdf8f9;hb=7962afbba9016ea03d9f2987fee341443fcde39d;hp=bce4cfe433f94af76f44664b4d565b9eb27cfe6f;hpb=22582bb2cbe85b40de5f561589e0468dac769515;p=elogind.git

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index bce4cfe43..1148a1529 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -31,15 +31,13 @@
 
 #include "udev.h"
 
-#define TMP_FILE_EXT                ".udev-tmp"
-
-static int node_symlink(struct udev *udev, const char *node, const char *slink)
+static int node_symlink(struct udev_device *dev, const char *node, const char *slink)
 {
         struct stat stats;
         char target[UTIL_PATH_SIZE];
         char *s;
         size_t l;
-        char slink_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
+        char slink_tmp[UTIL_PATH_SIZE + 32];
         int i = 0;
         int tail = 0;
         int err = 0;
@@ -76,7 +74,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                         len = readlink(slink, buf, sizeof(buf));
                         if (len > 0 && len < (int)sizeof(buf)) {
                                 buf[len] = '\0';
-                                if (strcmp(target, buf) == 0) {
+                                if (streq(target, buf)) {
                                         log_debug("preserve already existing symlink '%s' to '%s'\n", slink, target);
                                         label_fix(slink, true, false);
                                         utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
@@ -101,7 +99,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
         }
 
         log_debug("atomically replace '%s'\n", slink);
-        strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
+        strscpyl(slink_tmp, sizeof(slink_tmp), slink, ".tmp-", udev_device_get_id_filename(dev), NULL);
         unlink(slink_tmp);
         do {
                 err = mkdir_parents_label(slink_tmp, 0755);
@@ -156,7 +154,7 @@ static const char *link_find_prioritized(struct udev_device *dev, bool add, cons
                 log_debug("found '%s' claiming '%s'\n", dent->d_name, stackdir);
 
                 /* did we find ourself? */
-                if (strcmp(dent->d_name, udev_device_get_id_filename(dev)) == 0)
+                if (streq(dent->d_name, udev_device_get_id_filename(dev)))
                         continue;
 
                 dev_db = udev_device_new_from_device_id(udev, dent->d_name);
@@ -204,7 +202,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
                         util_delete_path(udev, slink);
         } else {
                 log_debug("creating link '%s' to '%s'\n", slink, target);
-                node_symlink(udev, target, slink);
+                node_symlink(dev, target, slink);
         }
 
         if (add) {
@@ -240,7 +238,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
                 udev_list_entry_foreach(list_entry_current, udev_device_get_devlinks_list_entry(dev)) {
                         const char *name_current = udev_list_entry_get_name(list_entry_current);
 
-                        if (strcmp(name, name_current) == 0) {
+                        if (streq(name, name_current)) {
                                 found = 1;
                                 break;
                         }
@@ -261,7 +259,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply, mode_t mo
         struct stat stats;
         int err = 0;
 
-        if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
+        if (streq(udev_device_get_subsystem(dev), "block"))
                 mode |= S_IFBLK;
         else
                 mode |= S_IFCHR;
@@ -298,7 +296,6 @@ out:
 
 void udev_node_add(struct udev_device *dev, bool apply, 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;
 
@@ -310,9 +307,9 @@ void udev_node_add(struct udev_device *dev, bool apply, mode_t mode, uid_t uid,
 
         /* always add /dev/{block,char}/$major:$minor */
         snprintf(filename, sizeof(filename), "/dev/%s/%u:%u",
-                 strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+                 streq(udev_device_get_subsystem(dev), "block") ? "block" : "char",
                  major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
-        node_symlink(udev, udev_device_get_devnode(dev), filename);
+        node_symlink(dev, 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))
@@ -330,7 +327,7 @@ void udev_node_remove(struct udev_device *dev)
 
         /* remove /dev/{block,char}/$major:$minor */
         snprintf(filename, sizeof(filename), "/dev/%s/%u:%u",
-                 strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+                 streq(udev_device_get_subsystem(dev), "block") ? "block" : "char",
                  major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
         unlink(filename);
 }