if (read_batch) {
int from_gen_pipe[2];
+ set_allow_inc_recurse();
if (fd_pair(from_gen_pipe) < 0) {
rsyserr(FERROR, errno, "pipe");
exit_cleanup(RERR_IPC);
*f_out_p = from_gen_pipe[1];
*f_in_p = batch_fd;
ret = -1; /* no child pid */
+#ifdef ICONV_CONST
setup_iconv();
+#endif
} else if (local_server) {
/* If the user didn't request --[no-]whole-file, force
* it on, but only if we're not batch processing. */
if (whole_file < 0 && !write_batch)
whole_file = 1;
+ set_allow_inc_recurse();
ret = local_child(argc, args, f_in_p, f_out_p, child_main);
+#ifdef ICONV_CONST
setup_iconv();
+#endif
} else {
+#ifdef ICONV_CONST
setup_iconv();
+#endif
if (protect_args) {
int fd;
#ifdef ICONV_OPTION
argc--;
argv++;
- if (argc == 0 && (recurse || list_only)) {
+ if (argc == 0 && (recurse || xfer_dirs || list_only)) {
argc = 1;
argv--;
argv[0] = ".";
if (write_batch < 0)
dry_run = 1;
- if (am_server)
+ if (am_server) {
+#ifdef ICONV_CONST
setup_iconv();
- else if (am_daemon)
+#endif
+ } else if (am_daemon)
return daemon_main();
if (am_server && protect_args) {