From 125fbe8768402f5d5ff52f273a6966c5864397a7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Oct 2018 13:34:05 +0200 Subject: fileio: fix error propagation in link_tmpfile() (cherry picked from commit eaa680c09e5701a62e8ac819211e5969eda84f2d) --- src/basic/fileio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/basic') diff --git a/src/basic/fileio.c b/src/basic/fileio.c index 7b1014b1d..026926980 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -1499,6 +1499,7 @@ int open_serialization_fd(const char *ident) { #if 0 /// UNNEEDED by elogind int link_tmpfile(int fd, const char *path, const char *target) { + int r; assert(fd >= 0); assert(target); @@ -1511,8 +1512,9 @@ int link_tmpfile(int fd, const char *path, const char *target) { * operation currently (renameat2() does), and there is no nice way to emulate this. */ if (path) { - if (rename_noreplace(AT_FDCWD, path, AT_FDCWD, target) < 0) - return -errno; + r = rename_noreplace(AT_FDCWD, path, AT_FDCWD, target); + if (r < 0) + return r; } else { char proc_fd_path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(fd) + 1]; -- cgit v1.2.3