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 964ddec9388a8ac0552de16ba0e9e7d9dc8cacec..85400a1836c069d2a4b857b558f50f513d0313e7 100644 (file)
--- 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 18da108464eca3c6f53468c7ff4856cf04367b0a..1f76373768569b94d510f96f733ce11e8c93cfdc 100644 (file)
--- 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)