Don't try to delete when list_only is set.

[rsync/rsync.git] / pipe.c

diff --git a/pipe.c b/pipe.c
index 696899f..12aa73d 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -7,8 +7,9 @@
  * 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 version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49,7 +50,7 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
        int from_child_pipe[2];
 
        if (verbose >= 2)
-               print_child_argv(command);
+               print_child_argv("opening connection using:", command);
 
        if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
                rsyserr(FERROR, errno, "pipe");
@@ -143,6 +144,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);
        }