Fixed several issues with preserving xattrs when using --backup.

[rsync/rsync.git] / pipe.c

diff --git a/pipe.c b/pipe.c
index 0614021..5f79ede 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -4,11 +4,11 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2008 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,9 +16,8 @@
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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"
@@ -28,6 +27,7 @@ extern int am_server;
 extern int blocking_io;
 extern int filesfrom_fd;
 extern mode_t orig_umask;
+extern char *logfile_name;
 extern struct chmod_mode_struct *chmod_modes;
 
 /**
@@ -49,9 +49,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) {
-               print_child_argv(command);
-       }
+       if (verbose >= 2)
+               print_child_argv("opening connection using:", command);
 
        if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
                rsyserr(FERROR, errno, "pipe");
@@ -134,6 +133,12 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                filesfrom_fd = -1;
                chmod_modes = NULL; /* Let the sending side handle this. */
 
+               /* Let the client side handle this. */
+               if (logfile_name) {
+                       logfile_name = NULL;
+                       logfile_close();
+               }
+
                if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
                    close(to_child_pipe[1]) < 0 ||
                    close(from_child_pipe[0]) < 0 ||
@@ -145,6 +150,9 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                        close(to_child_pipe[0]);
                if (from_child_pipe[1] != STDOUT_FILENO)
                        close(from_child_pipe[1]);
+#ifdef ICONV_CONST
+               setup_iconv();
+#endif
                child_main(argc, argv);
        }