Fix compression-ignoring of upper-case suffixes.
[rsync.git] / pipe.c
diff --git a/pipe.c b/pipe.c
index f3cea83fe6e247dca6ab0e0928d418101520511b..d3e84e54e58410364aa2bf52c292c37c23b9667d 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-2007 Wayne Davison
+ * Copyright (C) 2004-2009 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
@@ -133,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 ||
@@ -144,16 +150,12 @@ 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);
        }
 
-       /* 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) {
                rsyserr(FERROR, errno, "Failed to close");