X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c85631421deb9eb49abff012f7bbd0dc96278b1b..36f59b5802bdb2320d12d9429ef9347321cd2ec6:/rsync.c

diff --git a/rsync.c b/rsync.c
index 2a2505a0..2be63d59 100644
--- a/rsync.c
+++ b/rsync.c
@@ -50,10 +50,10 @@ extern int keep_dirlinks;
 extern int make_backups;
 extern struct stats stats;
 
-#ifdef HAVE_ICONV_OPEN
+#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 +66,27 @@ static char *default_charset(void)
 
 void setup_iconv()
 {
-	char *defset = default_charset();
+	const char *defset;
+	
+	if (!am_server)
+		return;
+
+	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