X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-device-private.c;h=234773662bb2b8e0cc0fe07b67b1b7ce270ccc58;hb=ac7019f33f1618f5b69ed44a8623e2596f1e3856;hp=a4dfa9bd3956719ddb894fab947c28aa0dce3821;hpb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;p=elogind.git

diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index a4dfa9bd3..234773662 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -25,7 +25,6 @@
 static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
 {
         const char *id;
-        struct udev *udev = udev_device_get_udev(dev);
         char filename[UTIL_PATH_SIZE];
 
         id = udev_device_get_id_filename(dev);
@@ -36,7 +35,7 @@ static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
         if (add) {
                 int fd;
 
-                util_create_path(udev, filename);
+                mkdir_parents(filename, 0755);
                 fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
                 if (fd >= 0)
                         close(fd);
@@ -96,9 +95,9 @@ static bool device_has_info(struct udev_device *udev_device)
 
 int udev_device_update_db(struct udev_device *udev_device)
 {
+        struct udev *udev = udev_device_get_udev(udev_device);
         bool has_info;
         const char *id;
-        struct udev *udev = udev_device_get_udev(udev_device);
         char filename[UTIL_PATH_SIZE];
         char filename_tmp[UTIL_PATH_SIZE];
         FILE *f;
@@ -120,10 +119,10 @@ int udev_device_update_db(struct udev_device *udev_device)
 
         /* write a database file */
         util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
-        util_create_path(udev, filename_tmp);
+        mkdir_parents(filename_tmp, 0755);
         f = fopen(filename_tmp, "we");
         if (f == NULL) {
-                err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
+                udev_err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
                 return -1;
         }
 
@@ -163,7 +162,7 @@ int udev_device_update_db(struct udev_device *udev_device)
 
         fclose(f);
         rename(filename_tmp, filename);
-        dbg(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty",
+        udev_dbg(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty",
              filename, udev_device_get_devpath(udev_device));
         return 0;
 }