Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved the batch option checking until after the protocol-version
[rsync/rsync.git]
/
pipe.c
diff --git
a/pipe.c
b/pipe.c
index
4508478
..
12aa73d
100644
(file)
--- a/
pipe.c
+++ b/
pipe.c
@@
-50,7
+50,7
@@
pid_t piped_child(char **command, int *f_in, int *f_out)
int from_child_pipe[2];
if (verbose >= 2)
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");
if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
rsyserr(FERROR, errno, "pipe");
@@
-144,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]);
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);
}
child_main(argc, argv);
}