aboutsummaryrefslogtreecommitdiff
path: root/iconvdata/tst-table-from.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-05-22 22:30:18 +0000
committerUlrich Drepper <drepper@redhat.com>2001-05-22 22:30:18 +0000
commit2373b30ea829ad5dd9599b29902c80101deefc78 (patch)
tree79874a0fea3457093e8f2834a2bf7bad41a1863a /iconvdata/tst-table-from.c
parent25e57b10f3943cefa888ba7f90e57bcda18ed7d8 (diff)
downloadglibc-2373b30ea829ad5dd9599b29902c80101deefc78.tar
glibc-2373b30ea829ad5dd9599b29902c80101deefc78.tar.gz
glibc-2373b30ea829ad5dd9599b29902c80101deefc78.tar.bz2
glibc-2373b30ea829ad5dd9599b29902c80101deefc78.zip
Update.
2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1255.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1255. * iconvdata/testdata/WINDOWS-1255: New file. * iconvdata/testdata/WINDOWS-1255..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1255 test. * iconvdata/CP1255.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1258.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1258. * iconvdata/testdata/WINDOWS-1258: New file. * iconvdata/testdata/WINDOWS-1258..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1258 test. * iconvdata/tst-table-from.c (try): Reset the iconv descriptor before the main call, and flush it afterwards. (utf8_decode): Return a string, possibly containing several Unicode characters. (main): Update all utf8_decode calls. * iconvdata/CP1258.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconv/gconv.c (__gconv): For flush without output, pass do_flush = 2. * iconv/skeleton.c: Distinguish do_flush = 1 and do_flush = 2. In the first case, set outbuf, outstart, outend, and call PREPARE_LOOP before EMIT_SHIFT_TO_INIT; then pass the output produced by this step down to the next step. In the second case, clear the state without calling EMIT_SHIFT_TO_INIT. * iconvdata/ibm930.c (EMIT_SHIFT_TO_INIT): Use outbuf instead of data->__outbuf, and outend instead of data->__outbufend. * iconvdata/ibm933.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm935.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm937.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm939.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn-ext.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-jp.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-kr.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/utf-7.c (EMIT_SHIFT_TO_INIT): Likewise. 2001-05-21 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (dl_main): Compute l_map_end for the main program. * elf/dl-sym.c (_dl_sym): Don't check for l_addr == 0. If match == _dl_loaded, caller can still come from the main program. (_dl_vsym): Likewise. * elf/dl-open.c (dl_open_worker): Don't check for l_addr == 0. * elf/dl-error.c (_dl_signal_error): Change NULL objname into "". * elf/restest2.c: New test. * elf/Makefile (tests): Add restest2. (restest2, LDFLAGS-restest2): Add rules.
Diffstat (limited to 'iconvdata/tst-table-from.c')
-rw-r--r--iconvdata/tst-table-from.c89
1 files changed, 72 insertions, 17 deletions
diff --git a/iconvdata/tst-table-from.c b/iconvdata/tst-table-from.c
index 5a2fa9d47a..b24632e1b9 100644
--- a/iconvdata/tst-table-from.c
+++ b/iconvdata/tst-table-from.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
@@ -64,9 +64,13 @@ try (iconv_t cd, unsigned char buf[], unsigned int buflen, unsigned char *out)
size_t inbytesleft = buflen;
char *outbuf = (char *) out;
size_t outbytesleft = 6;
- size_t result = iconv (cd,
- (char **) &inbuf, &inbytesleft,
- &outbuf, &outbytesleft);
+ size_t result;
+
+ iconv (cd, NULL, NULL, NULL, NULL);
+ result = iconv (cd, (char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ if (result != (size_t)(-1))
+ result = iconv (cd, NULL, NULL, &outbuf, &outbytesleft);
+
if (result == (size_t)(-1))
{
if (errno == EILSEQ)
@@ -100,17 +104,68 @@ try (iconv_t cd, unsigned char buf[], unsigned int buflen, unsigned char *out)
}
}
-/* Returns the out[] buffer as a Unicode value. */
-static unsigned int
+/* Returns the out[] buffer as a Unicode value, formatted as 0x%04X. */
+static const char *
utf8_decode (const unsigned char *out, unsigned int outlen)
{
- return (outlen==1 ? out[0] :
- outlen==2 ? ((out[0] & 0x1f) << 6) + (out[1] & 0x3f) :
- outlen==3 ? ((out[0] & 0x0f) << 12) + ((out[1] & 0x3f) << 6) + (out[2] & 0x3f) :
- outlen==4 ? ((out[0] & 0x07) << 18) + ((out[1] & 0x3f) << 12) + ((out[2] & 0x3f) << 6) + (out[3] & 0x3f) :
- outlen==5 ? ((out[0] & 0x03) << 24) + ((out[1] & 0x3f) << 18) + ((out[2] & 0x3f) << 12) + ((out[3] & 0x3f) << 6) + (out[4] & 0x3f) :
- outlen==6 ? ((out[0] & 0x01) << 30) + ((out[1] & 0x3f) << 24) + ((out[2] & 0x3f) << 18) + ((out[3] & 0x3f) << 12) + ((out[4] & 0x3f) << 6) + (out[5] & 0x3f) :
- 0xfffd);
+ static char hexbuf[42];
+ char *p = hexbuf;
+
+ while (outlen > 0)
+ {
+ if (p > hexbuf)
+ *p++ = ' ';
+
+ if (out[0] < 0x80)
+ {
+ sprintf (p, "0x%04X", out[0]);
+ out += 1; outlen -= 1;
+ }
+ else if (out[0] >= 0xc0 && out[0] < 0xe0 && outlen >= 2)
+ {
+ sprintf (p, "0x%04X", ((out[0] & 0x1f) << 6) + (out[1] & 0x3f));
+ out += 2; outlen -= 2;
+ }
+ else if (out[0] >= 0xe0 && out[0] < 0xf0 && outlen >= 3)
+ {
+ sprintf (p, "0x%04X", ((out[0] & 0x0f) << 12)
+ + ((out[1] & 0x3f) << 6) + (out[2] & 0x3f));
+ out += 3; outlen -= 3;
+ }
+ else if (out[0] >= 0xf0 && out[0] < 0xf8 && outlen >= 4)
+ {
+ sprintf (p, "0x%04X", ((out[0] & 0x07) << 18)
+ + ((out[1] & 0x3f) << 12)
+ + ((out[2] & 0x3f) << 6) + (out[3] & 0x3f));
+ out += 4; outlen -= 4;
+ }
+ else if (out[0] >= 0xf8 && out[0] < 0xfc && outlen >= 5)
+ {
+ sprintf (p, "0x%04X", ((out[0] & 0x03) << 24)
+ + ((out[1] & 0x3f) << 18)
+ + ((out[2] & 0x3f) << 12)
+ + ((out[3] & 0x3f) << 6) + (out[4] & 0x3f));
+ out += 5; outlen -= 5;
+ }
+ else if (out[0] >= 0xfc && out[0] < 0xfe && outlen >= 6)
+ {
+ sprintf (p, "0x%04X", ((out[0] & 0x01) << 30)
+ + ((out[1] & 0x3f) << 24)
+ + ((out[2] & 0x3f) << 18)
+ + ((out[3] & 0x3f) << 12)
+ + ((out[4] & 0x3f) << 6) + (out[5] & 0x3f));
+ out += 6; outlen -= 6;
+ }
+ else
+ {
+ sprintf (p, "0x????");
+ out += 1; outlen -= 1;
+ }
+
+ p += strlen (p);
+ }
+
+ return hexbuf;
}
int
@@ -148,7 +203,7 @@ main (int argc, char *argv[])
}
else if (result > 0)
{
- printf ("0x%02X\t0x%04X\n",
+ printf ("0x%02X\t%s\n",
i0, utf8_decode (out, result));
}
else
@@ -162,7 +217,7 @@ main (int argc, char *argv[])
}
else if (result > 0)
{
- printf ("0x%02X%02X\t0x%04X\n",
+ printf ("0x%02X%02X\t%s\n",
i0, i1, utf8_decode (out, result));
}
else
@@ -176,7 +231,7 @@ main (int argc, char *argv[])
}
else if (result > 0)
{
- printf ("0x%02X%02X%02X\t0x%04X\n",
+ printf ("0x%02X%02X%02X\t%s\n",
i0, i1, i2, utf8_decode (out, result));
}
else if (strcmp (charset, "UTF-8"))
@@ -190,7 +245,7 @@ main (int argc, char *argv[])
}
else if (result > 0)
{
- printf ("0x%02X%02X%02X%02X\t0x%04X\n",
+ printf ("0x%02X%02X%02X%02X\t%s\n",
i0, i1, i2, i3,
utf8_decode (out, result));
}