aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-05-07 21:58:34 +0000
committerUlrich Drepper <drepper@redhat.com>2000-05-07 21:58:34 +0000
commitc63b67bd9b89dc6f868f9affde85d5c5c262b9f9 (patch)
tree19034b998255542d9f4ffc86e6c8f8c3bfa6e923
parent45eca4d141c047950db48c69c8941163d0a61fcd (diff)
downloadglibc-c63b67bd9b89dc6f868f9affde85d5c5c262b9f9.zip
glibc-c63b67bd9b89dc6f868f9affde85d5c5c262b9f9.tar.gz
glibc-c63b67bd9b89dc6f868f9affde85d5c5c262b9f9.tar.bz2
Update.
2000-05-07 Ulrich Drepper <drepper@redhat.com> * iconv/Makefile (tests): Add tst-iconv1. * iconv/tst-iconv1.c: New file. Reported by yaoz@nih.gov.
-rw-r--r--ChangeLog6
-rw-r--r--iconv/Makefile4
-rw-r--r--iconv/tst-iconv1.c47
3 files changed, 56 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 04787bb..bc6ec3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-07 Ulrich Drepper <drepper@redhat.com>
+
+ * iconv/Makefile (tests): Add tst-iconv1.
+ * iconv/tst-iconv1.c: New file.
+ Reported by yaoz@nih.gov.
+
2000-05-06 Bruno Haible <haible@clisp.cons.org>
* iconv/gconv_open.c (__gconv_open): If __gconv_find_transform
diff --git a/iconv/Makefile b/iconv/Makefile
index 431100d..14076e6 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -34,6 +34,8 @@ CFLAGS-gconv_db.c = -DSTATIC_GCONV
CFLAGS-gconv_simple.c = -DSTATIC_GCONV
endif
+tests = tst-iconv1
+
distribute = gconv_builtin.h gconv_int.h loop.c skeleton.c
others = iconv_prog
diff --git a/iconv/tst-iconv1.c b/iconv/tst-iconv1.c
new file mode 100644
index 0000000..3164349
--- /dev/null
+++ b/iconv/tst-iconv1.c
@@ -0,0 +1,47 @@
+/* Test case by yaoz@nih.gov. */
+
+#include <iconv.h>
+#include <stdio.h>
+#include <string.h>
+
+int
+main (void)
+{
+ char utf8[5];
+ wchar_t ucs4[5];
+ iconv_t cd;
+ const char *inbuf;
+ char *outbuf;
+ size_t inbytes;
+ size_t outbytes;
+ size_t n;
+
+ strcpy (utf8, "abcd");
+
+ /* From UTF8 to UCS4. */
+ cd = iconv_open ("UCS4", "UTF8");
+ if (cd == (iconv_t) -1)
+ {
+ perror ("iconv_open");
+ return 1;
+ }
+
+ inbuf = utf8;
+ inbytes = 4;
+ outbuf = (char *) ucs4;
+#ifdef OK
+ outbytes = 5 * sizeof (wchar_t); /* Ok. */
+#else
+ outbytes = 4 * sizeof (wchar_t); /* "Argument list too long" error. */
+#endif
+ n = iconv (cd, &inbuf, &inbytes, &outbuf, &outbytes);
+ if (n == (size_t) -1)
+ {
+ perror ("iconv");
+ iconv_close (cd);
+ return 1;
+ }
+ iconv_close (cd);
+
+ return 0;
+}