env-file: rework write_env_file() to make use of O_TMPFILE

This commit is contained in:
Lennart Poettering
2025-05-22 02:50:48 +09:00
committed by Yu Watanabe
parent dfc9fd0147
commit c450027d14
3 changed files with 24 additions and 15 deletions
+4 -4
View File
@@ -321,7 +321,7 @@ int open_tmpfile_linkable_at(int dir_fd, const char *target, int flags, char **r
return fd;
}
int fopen_tmpfile_linkable(const char *target, int flags, char **ret_path, FILE **ret_file) {
int fopen_tmpfile_linkable_at(int dir_fd, const char *target, int flags, char **ret_path, FILE **ret_file) {
_cleanup_free_ char *path = NULL;
_cleanup_fclose_ FILE *f = NULL;
_cleanup_close_ int fd = -EBADF;
@@ -330,7 +330,7 @@ int fopen_tmpfile_linkable(const char *target, int flags, char **ret_path, FILE
assert(ret_file);
assert(ret_path);
fd = open_tmpfile_linkable(target, flags, &path);
fd = open_tmpfile_linkable_at(dir_fd, target, flags, &path);
if (fd < 0)
return fd;
@@ -380,7 +380,7 @@ int link_tmpfile_at(int fd, int dir_fd, const char *path, const char *target, Li
return 0;
}
int flink_tmpfile(FILE *f, const char *path, const char *target, LinkTmpfileFlags flags) {
int flink_tmpfile_at(FILE *f, int dir_fd, const char *path, const char *target, LinkTmpfileFlags flags) {
int fd, r;
assert(f);
@@ -394,7 +394,7 @@ int flink_tmpfile(FILE *f, const char *path, const char *target, LinkTmpfileFlag
if (r < 0)
return r;
return link_tmpfile(fd, path, target, flags);
return link_tmpfile_at(fd, dir_fd, path, target, flags);
}
int mkdtemp_malloc(const char *template, char **ret) {