From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 28 Apr 2016 11:03:41 +0000 (+0300)
Subject: lib-charset: Do not use //IGNORE on non-GNU system
X-Git-Tag: 2.2.25.rc1~377
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46f0240020160618bf3d08df8b75ec63186ebdec;p=thirdparty%2Fdovecot%2Fcore.git

lib-charset: Do not use //IGNORE on non-GNU system
---

diff --git a/src/lib-charset/charset-iconv.c b/src/lib-charset/charset-iconv.c
index 964ddec938..85400a1836 100644
--- a/src/lib-charset/charset-iconv.c
+++ b/src/lib-charset/charset-iconv.c
@@ -24,6 +24,8 @@ int charset_to_utf8_begin(const char *charset, normalizer_func_t *normalizer,
 	if (charset_is_utf8(charset))
 		cd = (iconv_t)-1;
 	else {
+		if (strcmp(charset, "UTF-8//TEST") == 0)
+			charset = "UTF-8";
 		cd = iconv_open("UTF-8", charset);
 		if (cd == (iconv_t)-1)
 			return -1;
diff --git a/src/lib-charset/test-charset.c b/src/lib-charset/test-charset.c
index 18da108464..1f76373768 100644
--- a/src/lib-charset/test-charset.c
+++ b/src/lib-charset/test-charset.c
@@ -105,7 +105,7 @@ static void test_charset_iconv(void)
 	}
 	/* Use //IGNORE just to force handling to be done by iconv
 	   instead of our own UTF-8 routines. */
-	test_charset_utf8_common("UTF-8//IGNORE");
+	test_charset_utf8_common("UTF-8//TEST");
 	test_end();
 }
 static void test_charset_iconv_crashes(void)