tree-wide: port various places over to use new rearrange_stdio()

[thirdparty/systemd.git] / src / journal / cat.c

diff --git a/src/journal/cat.c b/src/journal/cat.c
index c87a149a4c9ba45063db5fc72a0a8f8c33afe3eb..1815d58158b16de65725e4400884b9322552f0c1 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -135,14 +135,13 @@ int main(int argc, char *argv[]) {
 
         saved_stderr = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 3);
 
-        if (dup3(fd, STDOUT_FILENO, 0) < 0 ||
-            dup3(fd, STDERR_FILENO, 0) < 0) {
-                r = log_error_errno(errno, "Failed to duplicate fd: %m");
+        r = rearrange_stdio(STDIN_FILENO, fd, fd); /* Invalidates fd on succcess + error! */
+        fd = -1;
+        if (r < 0) {
+                log_error_errno(r, "Failed to rearrange stdout/stderr: %m");
                 goto finish;
         }
 
-        fd = safe_close_above_stdio(fd);
-
         if (argc <= optind)
                 (void) execl("/bin/cat", "/bin/cat", NULL);
         else