Switching to GPL 3.

[rsync/rsync.git] / pipe.c

diff --git a/pipe.c b/pipe.c
index 941e5d8..696899f 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -1,22 +1,22 @@
-/*  -*- c-file-style: "linux" -*-
+/*
+ * Routines used to setup various kinds of inter-process pipes.
  *
- * Copyright (C) 1996-2000 by Andrew Tridgell
- * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2004-2007 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -24,12 +24,13 @@
 extern int am_sender;
 extern int am_server;
 extern int blocking_io;
-extern int orig_umask;
-extern int write_batch;
 extern int filesfrom_fd;
+extern mode_t orig_umask;
+extern char *logfile_name;
+extern struct chmod_mode_struct *chmod_modes;
 
 /**
- * Create a child connected to use on stdin/stdout.
+ * Create a child connected to us via its stdin/stdout.
  *
  * This is derived from CVS code
  *
@@ -47,9 +48,8 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
        int to_child_pipe[2];
        int from_child_pipe[2];
 
-       if (verbose >= 2) {
+       if (verbose >= 2)
                print_child_argv(command);
-       }
 
        if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
                rsyserr(FERROR, errno, "pipe");
@@ -79,8 +79,7 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
                if (blocking_io > 0)
                        set_blocking(STDOUT_FILENO);
                execvp(command[0], command);
-               rsyserr(FERROR, errno, "Failed to exec %s",
-                       safe_fname(command[0]));
+               rsyserr(FERROR, errno, "Failed to exec %s", command[0]);
                exit_cleanup(RERR_IPC);
        }
 
@@ -112,6 +111,9 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
        int to_child_pipe[2];
        int from_child_pipe[2];
 
+       /* 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) {
                rsyserr(FERROR, errno, "pipe");
@@ -125,15 +127,10 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
        }
 
        if (pid == 0) {
-               am_sender = !am_sender;
+               am_sender = 0;
                am_server = 1;
-
-               /* The server side never writes the batch, even if it
-                * is local (it makes the logic easier elsewhere). */
-               write_batch = 0;
-
-               if (!am_sender)
-                       filesfrom_fd = -1;
+               filesfrom_fd = -1;
+               chmod_modes = NULL; /* Let the sending side handle this. */
 
                if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
                    close(to_child_pipe[1]) < 0 ||
@@ -149,8 +146,11 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                child_main(argc, argv);
        }
 
-       if (!am_sender)
-               filesfrom_fd = -1;
+       /* Let the client side handle this. */
+       if (logfile_name) {
+               logfile_name = NULL;
+               logfile_close();
+       }
 
        if (close(from_child_pipe[1]) < 0 ||
            close(to_child_pipe[0]) < 0) {