search for: iconv_opt

diff --git a/clientserver.c b/clientserver.c index 2d7c28f..694a72d 100644 --- a/clientserver.c +++ b/clientserver.c @@ -806,6 +806,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) exit_cleanup(RERR_UNSUPPORTED); } +#ifdef ICONV_OPTION if (!iconv_opt) { if (ic_send != (iconv_t)-1) { iconv_close(ic_send); @@ -816,6 +817,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) ic_recv = (iconv_t)-1; } } +#endif if (!numeric_ids && (use_chroot ? lp_numeric_ids(i) !=...

...a possible rewrite: /* Write an message to a multiplexed stream. If this fails, rsync exits. */ static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert) { char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */ size_t n = len; #ifdef ICONV_OPTION if (convert && ic_send == (iconv_t)-1) #endif convert = 0; #ifdef ICONV_OPTION /* We need to convert buf before doing anything else so that we * can include the (converted) byte length in the message header. */ if (convert) {...

...ght place, but here goes. It's a tiny patch at any rate. -- Jonas H?ggqvist rasher(at)rasher(dot)dk -------------- next part -------------- diff --git a/options.c b/options.c index 8b67275..bfcb3e6 100644 --- a/options.c +++ b/options.c @@ -197,6 +197,7 @@ int need_unsorted_flist = 0; #ifdef ICONV_OPTION char *iconv_opt = ICONV_OPTION; #endif +int fat_filenames = 0; struct chmod_mode_struct *chmod_modes = NULL; @@ -779,6 +780,7 @@ void usage(enum logcode F) #ifdef ICONV_OPTION rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filenames\n"); #endif + rpr...

...web.de QAContact: rsync-qa@samba.org If rsync-3.0.0pre1 is called like rsync --iconv=UTF-8-MAC,UTF-8 SOURCE HOST:DEST the client charset, here UTF-8-MAC, is forwarded to the server process rather than the specified destination charset UTF-8. This is due a bug in setup_iconv() where iconv_opt isn't truncated to the destination charset as expected by server_options(...). -- Configure bugmail: https://bugzilla.samba.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug, or are watching the QA contact.

In debian bug #493559 (http://bugs.debian.org/493559) the problem is that when requesting a file from an older version rsync, the remote server gives an error: $ rsync rsync://rsync.blackholes.us/zones/countries/countries.rbl /tmp rsync: on remote machine: -: unknown option rsync error: requested action not supported (code 4) at clientserver.c(517) rsync: connection unexpectedly closed (4 bytes

...b at passing the option on to the ssh process. It checks that the remote shell program is something that looks like ssh. Perhaps that could be done cleaner... Paul Slootman --- a/main.c 2008-03-01 21:01:41.000000000 +0100 +++ b/main.c 2008-03-04 18:55:10.933488013 +0100 @@ -82,6 +82,7 @@ #ifdef ICONV_OPTION extern iconv_t ic_send; #endif +extern int default_af_hint; uid_t our_uid; int local_server = 0; @@ -381,6 +382,23 @@ *t++ = '\0'; } +#ifdef AF_INET + if (default_af_hint == AF_INET) { + if (strncmp(cmd, "ssh", 3) == 0 || strstr(...

...been specifically disabled (?), here's a patch to enable safe incremental file lists between a 3.1.0 client and a pre 3.1.0 daemon (protocol version 30) --- options.c.ORIG 2013-06-12 06:28:45.000000000 +1000 +++ options.c 2013-10-21 12:46:25.251082555 +1100 @@ -2477,6 +2477,8 @@ #ifdef ICONV_OPTION argstr[x++] = 's'; #endif + if (protocol_version == 30) + argstr[x++] = 'f'; } if (x >= (int)sizeof argstr) { /* Not possible... */ thanks, /Per Lundqvist

...ograms are linking differently. Perhaps > configure decided that it needed -liconv when that that library > doesn't really work? $ nm ./test | grep iconv U iconv_open@@GLIBC_2.1 $ nm ./rsync | grep iconv U iconv@@GLIBC_2.1 U iconv_open@@GLIBC_2.1 08091cfc B iconv_opt 0804ada0 T setup_iconv As I undersnand, programs are linked equally? > Also, did you run the test program on the same machine that is logging > the error? (I assume the sending/server side, not the client side.) Sure. When I started to play with iconv, I've used ALT linux (russian dis...

...ssages_from_generator; @@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv; #endif /* These index values are for the file-list's extra-attribute array. */ -int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx; +int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx; #ifdef ICONV_OPTION int filesfrom_convert = 0; @@ -124,6 +125,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; + if (preserve_fileflags) + fileflags_ndx = ++file_extra_cnt; if (preserve_acls && !am_sender) acls_ndx = ++file...

...r/share/locale"); textdomain("rsync"); #endif flist.c ------- Below a lot of "extern" declarations, I added the following line ... #define _(String) gettext (String) ... so that the code becomes as follows. extern struct filter_list_struct daemon_filter_list; #ifdef ICONV_OPTION extern int filesfrom_convert; extern iconv_t ic_send, ic_recv; #endif #define PTR_SIZE (sizeof (struct file_struct *)) /* Following line added for Localisation. This requires libintl.h to be included in the main.c file.*/ #define _(String) gettext (String) int io_error; With the above modifi...