From: Wayne Davison <wayned@samba.org>
Date: Sun, 5 Feb 2006 07:20:10 +0000 (+0000)
Subject: In default_charset(): if nl_langinfo() gives us "646", return "ascii".
X-Git-Tag: v2.6.7pre1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0be05d6038351c29f9bb7fafdc8d55c371ee6aeb;p=thirdparty%2Frsync.git

In default_charset(): if nl_langinfo() gives us "646", return "ascii".
---

diff --git a/rsync.c b/rsync.c
index ee2f72b6..8595d517 100644
--- a/rsync.c
+++ b/rsync.c
@@ -58,7 +58,10 @@ static 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);
+	char *def = nl_langinfo(CODESET);
+	if (strcmp(def, "646") == 0) /* Solaris brain-damage */
+		return "ascii";
+	return def;
 #else
 	return ""; /* Works with (at the very least) gnu iconv... */
 #endif