diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | iconvdata/Makefile | 2 | ||||
| -rw-r--r-- | iconvdata/bug-iconv9.c | 68 |
3 files changed, 75 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index beb8281ba7..52a2b53b3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-27 Ulrich Drepper <drepper@gmail.com> + + [BZ #12814] + * iconvdata/Makefile (tests): Add bug-iconv9. + * iconvdata/bug-iconv9.c: New file. + 2011-05-27 Andreas Schwab <schwab@redhat.com> [BZ #12814] diff --git a/iconvdata/Makefile b/iconvdata/Makefile index e0fe46aa72..94f860ab9b 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -68,7 +68,7 @@ include ../Makeconfig ifeq (yes,$(build-shared)) tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ - tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 + tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 ifeq ($(have-thread-library),yes) tests += bug-iconv3 endif diff --git a/iconvdata/bug-iconv9.c b/iconvdata/bug-iconv9.c new file mode 100644 index 0000000000..e4ffd593e5 --- /dev/null +++ b/iconvdata/bug-iconv9.c @@ -0,0 +1,68 @@ +// BZ 12814 +#include <errno.h> +#include <iconv.h> +#include <stdio.h> +#include <string.h> + +static int +do_test (void) +{ + iconv_t h = iconv_open ("ISO-2022-JP-2", "UTF-8"); + if (h == (iconv_t) -1) + { + printf ("cannot load iconv module: %m\n"); + return 1; + } + + // Euro sign + static const char inbuf[] = "\xe2\x82\xac"; + char *in = (char *) inbuf; + size_t inlen = sizeof (inbuf) - 1; + + char outbuf[100]; + char *out = outbuf; + size_t outlen = sizeof (outbuf); + + int res = 0; + size_t n = iconv (h, &in, &inlen, &out, &outlen); + if (n == (size_t) -1) + { + printf ("iconv failed with %d: %m\n", errno); + return 1; + } + if (n != 0) + { + printf ("iconv returned %zu, expected zero\n", n); + res = 1; + } + if (in != inbuf + sizeof (inbuf) - 1) + { + printf ("in advanced by %jd, expected %zu\n", + in - inbuf, sizeof (inbuf) - 1); + res = 1; + } + static const char expected[] = "\x1b\x2e\x46\x1b\x4e\x24"; + if (out - outbuf != sizeof (expected) - 1 + || memcmp (outbuf, expected, sizeof (expected) - 1) != 0) + { + fputs ("generated sequence is: \"", stdout); + for (size_t i = 0; i < out - outbuf; ++i) + printf ("\\x%02hhx", outbuf[i]); + fputs ("\", expected \"", stdout); + for (size_t i = 0; i < sizeof (expected) - 1; ++i) + printf ("\\x%02hhx", expected[i]); + puts ("\""); + res = 1; + } + + if (iconv_close (h) != 0) + { + puts ("failed closing iconv module"); + res = 1; + } + + return res; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |