More tweaks for Actions.

[thirdparty/rsync.git] / pipe.c

diff --git a/pipe.c b/pipe.c
index 755da545dee33e8b2f516fa22bc558100e07a380..3e5f038b5d4538cfccad86ab2ec6dc6756db42ff 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004-2008 Wayne Davison
+ * Copyright (C) 2004-2020 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ extern int am_sender;
 extern int am_server;
 extern int blocking_io;
 extern int filesfrom_fd;
-extern mode_t orig_umask;
+extern int munge_symlinks;
 extern char *logfile_name;
 extern int remote_option_cnt;
 extern const char **remote_options;
@@ -66,10 +66,10 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
        }
 
        if (pid == 0) {
-               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
-                   close(to_child_pipe[1]) < 0 ||
-                   close(from_child_pipe[0]) < 0 ||
-                   dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
+               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0
+                || close(to_child_pipe[1]) < 0
+                || close(from_child_pipe[0]) < 0
+                || dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
                        rsyserr(FERROR, errno, "Failed to dup/close");
                        exit_cleanup(RERR_IPC);
                }
@@ -77,7 +77,6 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
                        close(to_child_pipe[0]);
                if (from_child_pipe[1] != STDOUT_FILENO)
                        close(from_child_pipe[1]);
-               umask(orig_umask);
                set_blocking(STDIN_FILENO);
                if (blocking_io > 0)
                        set_blocking(STDOUT_FILENO);
@@ -117,8 +116,7 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
        /* The parent process is always the sender for a local rsync. */
        assert(am_sender);
 
-       if (fd_pair(to_child_pipe) < 0 ||
-           fd_pair(from_child_pipe) < 0) {
+       if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
                rsyserr(FERROR, errno, "pipe");
                exit_cleanup(RERR_IPC);
        }
@@ -133,6 +131,7 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                am_sender = 0;
                am_server = 1;
                filesfrom_fd = -1;
+               munge_symlinks = 0; /* Each side needs its own option. */
                chmod_modes = NULL; /* Let the sending side handle this. */
 
                /* Let the client side handle this. */
@@ -150,10 +149,10 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                        }
                }
 
-               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
-                   close(to_child_pipe[1]) < 0 ||
-                   close(from_child_pipe[0]) < 0 ||
-                   dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
+               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0
+                || close(to_child_pipe[1]) < 0
+                || close(from_child_pipe[0]) < 0
+                || dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
                        rsyserr(FERROR, errno, "Failed to dup/close");
                        exit_cleanup(RERR_IPC);
                }
@@ -167,8 +166,7 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                child_main(argc, argv);
        }
 
-       if (close(from_child_pipe[1]) < 0 ||
-           close(to_child_pipe[0]) < 0) {
+       if (close(from_child_pipe[1]) < 0 || close(to_child_pipe[0]) < 0) {
                rsyserr(FERROR, errno, "Failed to close");
                exit_cleanup(RERR_IPC);
        }