[PATCH] build fix without iconv support
Matt McCutchen
matt at mattmccutchen.net
Wed Feb 20 14:59:39 GMT 2008
Wayne already made this change to the development rsync in commit
15dbffc2.
Matt
On Wed, 2008-02-20 at 15:20 +0200, Antti Tapaninen wrote:
> 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) != False : lp_numeric_ids(i) == True))
> diff --git a/options.c b/options.c
> index 7f69bd2..75ceeeb 100644
> --- a/options.c
> +++ b/options.c
> @@ -1137,7 +1137,9 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
> break;
>
> case OPT_NO_ICONV:
> +#ifdef ICONV_OPTION
> iconv_opt = NULL;
> +#endif
> break;
>
> case OPT_MAX_SIZE:
More information about the rsync
mailing list