/*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tsticonv.c,v 1.21 2006-08-27 19:04:03 adam Exp $
+ * $Id: tsticonv.c,v 1.26 2007-03-12 10:59:59 adam Exp $
*/
#if HAVE_CONFIG_H
char outbuf[12];
size_t inbytesleft = strlen(buf);
const char *inp = buf;
- while (inbytesleft)
+ int rounds = 0;
+ for (rounds = 0; inbytesleft && rounds < sizeof(outbuf); rounds++)
{
size_t outbytesleft = sizeof(outbuf);
char *outp = outbuf;
size_t r = yaz_iconv(cd, (char**) &inp, &inbytesleft,
&outp, &outbytesleft);
+ wrbuf_write(b, outbuf, outp - outbuf);
if (r == (size_t) (-1))
{
int e = yaz_iconv_error(cd);
if (e != YAZ_ICONV_E2BIG)
break;
}
- wrbuf_write(b, outbuf, outp - outbuf);
}
if (wrbuf_len(b) == strlen(cmpbuf)
&& !memcmp(cmpbuf, wrbuf_buf(b), wrbuf_len(b)))
"\xe5" "\xe5",
0 };
-static void tst_marc8_to_ucs4b()
+static void tst_marc8_to_ucs4b(void)
{
yaz_iconv_t cd = yaz_iconv_open("UCS4", "MARC8");
YAZ_CHECK(cd);
yaz_iconv_close(cd);
}
-static void tst_ucs4b_to_utf8()
+static void tst_ucs4b_to_utf8(void)
{
yaz_iconv_t cd = yaz_iconv_open("UTF8", "UCS4");
YAZ_CHECK(cd);
return 1;
}
-static void tst_marc8_to_utf8()
+static void tst_marc8_to_utf8(void)
{
yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC8");
/* COMBINING ACUTE ACCENT */
YAZ_CHECK(tst_convert(cd, "Cours de mathâe",
"Cours de mathe\xcc\x81"));
+
+
+ YAZ_CHECK(tst_convert(cd, "a\xea\x1e", "a\x1e\xcc\x8a"));
+
+ YAZ_CHECK(tst_convert(cd, "a\xea", "a"));
yaz_iconv_close(cd);
}
-static void tst_marc8s_to_utf8()
+static void tst_marc8s_to_utf8(void)
{
yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC8s");
}
-static void tst_marc8_to_latin1()
+static void tst_marc8_to_latin1(void)
{
yaz_iconv_t cd = yaz_iconv_open("ISO-8859-1", "MARC8");
yaz_iconv_close(cd);
}
-static void tst_utf8_to_marc8()
+static void tst_utf8_to_marc8(void)
{
yaz_iconv_t cd = yaz_iconv_open("MARC8", "UTF-8");
/** Ideographic question mark (Unicode FF1F) */
YAZ_CHECK(tst_convert(cd,
"\xEF\xBC\x9F" "o", /* UTF-8 */
- "\033(1" "\x21\x2B\x3B" "\033(B" "o" ));
+ "\033$1" "\x21\x2B\x3B" "\033(B" "o" ));
/** Superscript 0 . bug #642 */
yaz_iconv_close(cd);
}
+static void tst_advance_to_utf8(void)
+{
+ yaz_iconv_t cd = yaz_iconv_open("utf-8", "advancegreek");
+
+ YAZ_CHECK(cd);
+ if (!cd)
+ return;
+
+ YAZ_CHECK(tst_convert(cd, "Cours ", "Cours "));
+ yaz_iconv_close(cd);
+}
+
+static void tst_utf8_to_advance(void)
+{
+ yaz_iconv_t cd = yaz_iconv_open("advancegreek", "utf-8");
-static void tst_latin1_to_marc8()
+ YAZ_CHECK(cd);
+ if (!cd)
+ return;
+
+ YAZ_CHECK(tst_convert(cd, "Cours ", "Cours "));
+ yaz_iconv_close(cd);
+}
+
+static void tst_latin1_to_marc8(void)
{
yaz_iconv_t cd = yaz_iconv_open("MARC8", "ISO-8859-1");
yaz_iconv_close(cd);
}
-static void tst_utf8_codes()
+static void tst_utf8_codes(void)
{
YAZ_CHECK(utf8_check(3));
YAZ_CHECK(utf8_check(127));
tst_marc8_to_latin1();
+ tst_advance_to_utf8();
+ tst_utf8_to_advance();
+
tst_utf8_to_marc8();
tst_latin1_to_marc8();