aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-02-04 22:03:44 +0000
committerWayne Davison <wayned@samba.org>2006-02-04 22:03:44 +0000
commit9656de5d13a914e79643fe5e403c6303205a042f (patch)
tree53ae7dfbf97409ee79260bb4ffb8f3b1fe3d137b /main.c
parent9a31746b1042694b384cb6bac2596d504b23dc6a (diff)
downloadandroid_external_rsync-9656de5d13a914e79643fe5e403c6303205a042f.tar.gz
android_external_rsync-9656de5d13a914e79643fe5e403c6303205a042f.tar.bz2
android_external_rsync-9656de5d13a914e79643fe5e403c6303205a042f.zip
Call setup_iconv().
Diffstat (limited to 'main.c')
-rw-r--r--main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/main.c b/main.c
index f60d4aec..dfee754a 100644
--- a/main.c
+++ b/main.c
@@ -792,6 +792,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
+#ifdef HAVE_ICONV
+ setup_iconv();
+#endif
if (protocol_version >= 23)
io_start_multiplex_out();
@@ -828,6 +831,9 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
+#ifdef HAVE_ICONV
+ setup_iconv();
+#endif
if (protocol_version >= 23 && !read_batch)
io_start_multiplex_in();