diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-13 12:11:29 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-13 14:39:30 +0100 |
commit | 2053593fccabc179881ed7a9b57afcaa8a878cd4 (patch) | |
tree | e29a100b48891b1e92137e44c74de76315a343ec /src/tmpfiles | |
parent | d70eaf3067e12522655afe7064f312ef0e01eb56 (diff) | |
download | systemd-2053593fccabc179881ed7a9b57afcaa8a878cd4.tar.gz |
treewide: drop "RUN_" from "RUN_WITH_UMASK"
RUN_WITH_UMASK was initially conceived for spawning externals progs with the
umask set. But nowadays we use it various syscalls and stuff that doesn't "run"
anything, so the "RUN_" prefix has outlived its usefulness.
Diffstat (limited to 'src/tmpfiles')
-rw-r--r-- | src/tmpfiles/tmpfiles.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index f156d90073..efe0e107b1 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1499,7 +1499,7 @@ static int create_file(Item *i, const char *path) { if (dir_fd < 0) return dir_fd; - RUN_WITH_UMASK(0000) { + WITH_UMASK(0000) { mac_selinux_create_file_prepare(path, S_IFREG); fd = RET_NERRNO(openat(dir_fd, bn, O_CREAT|O_EXCL|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode)); mac_selinux_create_file_clear(); @@ -1572,7 +1572,7 @@ static int truncate_file(Item *i, const char *path) { if (fd == -ENOENT) { creation = CREATION_NORMAL; /* Didn't work without O_CREATE, try again with */ - RUN_WITH_UMASK(0000) { + WITH_UMASK(0000) { mac_selinux_create_file_prepare(path, S_IFREG); fd = RET_NERRNO(openat(dir_fd, bn, O_CREAT|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode)); mac_selinux_create_file_clear(); @@ -1716,14 +1716,14 @@ static int create_directory_or_subvolume( subvol = false; else { - RUN_WITH_UMASK((~mode) & 0777) + WITH_UMASK((~mode) & 0777) r = btrfs_subvol_make_fd(pfd, bn); } } else r = 0; if (!subvol || ERRNO_IS_NOT_SUPPORTED(r)) - RUN_WITH_UMASK(0000) + WITH_UMASK(0000) r = mkdirat_label(pfd, bn, mode); creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; @@ -1869,7 +1869,7 @@ static int create_device(Item *i, mode_t file_type) { if (dfd < 0) return dfd; - RUN_WITH_UMASK(0000) { + WITH_UMASK(0000) { mac_selinux_create_file_prepare(i->path, file_type); r = RET_NERRNO(mknodat(dfd, bn, i->mode | file_type, i->major_minor)); mac_selinux_create_file_clear(); @@ -1900,7 +1900,7 @@ static int create_device(Item *i, mode_t file_type) { if (i->append_or_force) { fd = safe_close(fd); - RUN_WITH_UMASK(0000) { + WITH_UMASK(0000) { mac_selinux_create_file_prepare(i->path, file_type); r = mknodat_atomic(dfd, bn, i->mode | file_type, i->major_minor); mac_selinux_create_file_clear(); @@ -1971,7 +1971,7 @@ static int create_fifo(Item *i) { if (pfd < 0) return pfd; - RUN_WITH_UMASK(0000) { + WITH_UMASK(0000) { mac_selinux_create_file_prepare(i->path, S_IFIFO); r = RET_NERRNO(mkfifoat(pfd, bn, i->mode)); mac_selinux_create_file_clear(); @@ -1996,7 +1996,7 @@ static int create_fifo(Item *i) { if (i->append_or_force) { fd = safe_close(fd); - RUN_WITH_UMASK(0000) { + WITH_UMASK(0000) { mac_selinux_create_file_prepare(i->path, S_IFIFO); r = mkfifoat_atomic(pfd, bn, i->mode); mac_selinux_create_file_clear(); @@ -2378,7 +2378,7 @@ static int mkdir_parents_rm_if_wrong_type(mode_t child_mode, const char *path) { if (r == -ENOENT) r = rm_if_wrong_type_safe(S_IFDIR, parent_fd, &parent_st, t, AT_SYMLINK_NOFOLLOW); if (r == -ENOENT) { - RUN_WITH_UMASK(0000) + WITH_UMASK(0000) r = mkdirat_label(parent_fd, t, 0755); if (r < 0) { _cleanup_free_ char *parent_name = NULL; @@ -2416,7 +2416,7 @@ static int mkdir_parents_item(Item *i, mode_t child_mode) { if (r < 0 && r != -ENOENT) return r; } else - RUN_WITH_UMASK(0000) + WITH_UMASK(0000) (void) mkdir_parents_label(i->path, 0755); return 0; |