X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/26bbb6aa4b1ebce2b2d0f925deb53ab294c5fe71..44a7ba4587a645c7f4a8f4ed4f7de9b83605a49e:/main.c

diff --git a/main.c b/main.c
index 4b67f2ac..154ddde7 100644
--- a/main.c
+++ b/main.c
@@ -448,13 +448,22 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
 		*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;
 		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
@@ -1476,7 +1485,11 @@ int main(int argc,char *argv[])
 	if (write_batch < 0)
 		dry_run = 1;
 
-	if (am_daemon && !am_server)
+	if (am_server) {
+#ifdef ICONV_CONST
+		setup_iconv();
+#endif
+	} else if (am_daemon)
 		return daemon_main();
 
 	if (am_server && protect_args) {