X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9b499e95373954240eaff3b43fcfc703035c9dc6..c2b5407678c9d72dbed1e72760c4d36945d5ddd5:/rsync.c diff --git a/rsync.c b/rsync.c index 6d1ee8f9..7f1056bb 100644 --- a/rsync.c +++ b/rsync.c @@ -21,6 +21,14 @@ process */ #include "rsync.h" +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#include +#endif +#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET +#include +#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO +#include +#endif extern int verbose; extern int dry_run; @@ -35,6 +43,7 @@ extern int am_server; extern int am_sender; extern int am_generator; extern int am_starting_up; +extern int allow_8bit_chars; extern int preserve_uid; extern int preserve_gid; extern int inplace; @@ -42,6 +51,43 @@ extern int keep_dirlinks; extern int make_backups; extern struct stats stats; +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +iconv_t ic_chck = (iconv_t)-1; + +static const char *default_charset(void) +{ +#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET + return locale_charset(); +#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO + return nl_langinfo(CODESET); +#else + return ""; /* Works with (at the very least) gnu iconv... */ +#endif +} + +void setup_iconv() +{ + if (!am_server && !allow_8bit_chars) { + const char *defset = default_charset(); + + /* It's OK if this fails... */ + ic_chck = iconv_open(defset, defset); + + if (verbose > 3) { + if (ic_chck == (iconv_t)-1) { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") failed (%d)" + " -- using isprint() instead of iconv().\n", + defset, defset, errno); + } else { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") succeeded.\n", + defset, defset); + } + } + } +} +#endif /* free a sums struct