fs-util: add simple open_mkdir() wrapper

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 3e2db9530422298b019a3478c1c29f001fcee186..b050438cd7aa59cb9965f2dbaeb37ca3f9d28359 100644 (file)
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -137,6 +137,9 @@ int open_mkdir_at_full(int dirfd, const char *path, int flags, XOpenFlags xopen_
 static inline int open_mkdir_at(int dirfd, const char *path, int flags, mode_t mode) {
         return open_mkdir_at_full(dirfd, path, flags, 0, mode);
 }
+static inline int open_mkdir(const char *path, int flags, mode_t mode) {
+        return open_mkdir_at_full(AT_FDCWD, path, flags, 0, mode);
+}
 
 int openat_report_new(int dirfd, const char *pathname, int flags, mode_t mode, bool *ret_newly_created);
 

diff --git a/src/core/namespace.c b/src/core/namespace.c
index e521dc964c4c944b1c6a590dc3155722eb5fdd68..e96c961c50a39e25aabe26f238c4f920ed4db6b5 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -2805,7 +2805,7 @@ static int make_tmp_prefix(const char *prefix) {
 
         /* umask will corrupt this access mode, but that doesn't matter, we need to call chmod() anyway for
          * the suid bit, below. */
-        fd = open_mkdir_at(AT_FDCWD, t, O_EXCL|O_CLOEXEC, 0777);
+        fd = open_mkdir(t, O_EXCL|O_CLOEXEC, 0777);
         if (fd < 0)
                 return fd;
 

diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index eb87b379151c11c26b6b1572fb1c9ef6badb1b32..edc9a4b274b2e19a8532960dd5267353186776ff 100644 (file)
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -133,7 +133,7 @@ int home_setup_cifs(
                         return log_oom();
 
                 if (FLAGS_SET(flags, HOME_SETUP_CIFS_MKDIR)) {
-                        setup->root_fd = open_mkdir_at(AT_FDCWD, j, O_CLOEXEC, 0700);
+                        setup->root_fd = open_mkdir(j, O_CLOEXEC, 0700);
                         if (setup->root_fd < 0)
                                 return log_error_errno(setup->root_fd, "Failed to create CIFS subdirectory: %m");
                 }

diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c
index 986b53bdd6fc22bda206c67e79e9f033f9b9f85b..eaf772bff2c5035f7e0954c9e7812a2e4acae08c 100644 (file)
--- a/src/shared/creds-util.c
+++ b/src/shared/creds-util.c
@@ -478,7 +478,7 @@ int get_credential_host_secret(CredentialSecretFlags flags, struct iovec *ret) {
         assert(filename);
 
         mkdir_parents(dirname, 0755);
-        dfd = open_mkdir_at(AT_FDCWD, dirname, O_CLOEXEC, 0755);
+        dfd = open_mkdir(dirname, O_CLOEXEC, 0755);
         if (dfd < 0)
                 return log_debug_errno(dfd, "Failed to create or open directory '%s': %m", dirname);
 

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 633fb2a31d7d7b8c66178679e5d867c2512e7128..253ffa7b7ca6a1f26c09cb75804cd9a2e7b600fe 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -375,7 +375,7 @@ static int stack_directory_open(sd_device *dev, const char *slink, int *ret_dirf
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to create stack directory '%s': %m", dirname);
 
-        dirfd = open_mkdir_at(AT_FDCWD, dirname, O_CLOEXEC | O_DIRECTORY | O_NOFOLLOW | O_RDONLY, 0755);
+        dirfd = open_mkdir(dirname, O_CLOEXEC | O_DIRECTORY | O_NOFOLLOW | O_RDONLY, 0755);
         if (dirfd < 0)
                 return log_device_debug_errno(dev, dirfd, "Failed to open stack directory '%s': %m", dirname);
 

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 258eb26a65feae5713b4d87459be6c08ddc9614c..1e7b9c04cae625f3e28afd4a89b051c5a01bbb17 100644 (file)
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -192,7 +192,7 @@ int udev_watch_begin(int inotify_fd, sd_device *dev) {
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to get device ID: %m");
 
-        r = dirfd = open_mkdir_at(AT_FDCWD, "/run/udev/watch", O_CLOEXEC | O_RDONLY, 0755);
+        r = dirfd = open_mkdir("/run/udev/watch", O_CLOEXEC | O_RDONLY, 0755);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to create and open '/run/udev/watch/': %m");