X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ceccbacc34d71a5d90986b2318e634daaad0f296..c2b5407678c9d72dbed1e72760c4d36945d5ddd5:/rsync.c

diff --git a/rsync.c b/rsync.c
index b9db23b6..7f1056bb 100644
--- a/rsync.c
+++ b/rsync.c
@@ -21,7 +21,7 @@
    process */
 
 #include "rsync.h"
-#if defined HAVE_ICONV && defined HAVE_ICONV_H
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
 #include <iconv.h>
 #endif
 #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
@@ -43,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;
@@ -50,10 +51,10 @@ extern int keep_dirlinks;
 extern int make_backups;
 extern struct stats stats;
 
-#ifdef HAVE_ICONV
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
 iconv_t ic_chck = (iconv_t)-1;
 
-static char *default_charset(void)
+static const char *default_charset(void)
 {
 #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
 	return locale_charset();
@@ -66,13 +67,24 @@ static char *default_charset(void)
 
 void setup_iconv()
 {
-	char *defset = default_charset();
+	if (!am_server && !allow_8bit_chars) {
+		const char *defset = default_charset();
 
-	if (!am_server
-	 && (ic_chck = iconv_open(defset, defset)) == (iconv_t)-1) {
-		rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n",
-			defset, defset);
-		exit_cleanup(RERR_UNSUPPORTED);
+		/* 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