This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.13-225-gfdc2fef
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 May 2011 12:37:37 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.13-225-gfdc2fef
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via fdc2fefe46db79f0a19f690531cd775fbbc2740f (commit)
via e57420c6c67b914abb01f7c3b1d999795121ce70 (commit)
via 4d07db153ea9acc5c3201647bd06024e5801ae89 (commit)
from ea486f691d34ef2a28d06bb507ac3352e32e1f13 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fdc2fefe46db79f0a19f690531cd775fbbc2740f
commit fdc2fefe46db79f0a19f690531cd775fbbc2740f
Merge: e57420c ea486f6
Author: Ulrich Drepper <drepper@gmail.com>
Date: Fri May 27 08:37:18 2011 -0400
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
NEWS
diff --cc ChangeLog
index 52a2b53,299905a..34df6ba
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,18 +1,29 @@@
+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]
+ * iconvdata/iso-2022-jp.c (BODY): Fix invalid variable shadowing.
+
+ 2011-05-25 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/sys/user.h
+ (struct user_regs_struct): Change intcs field back to cs.
+
+ 2011-05-25 Ulrich Drepper <drepper@gmail.com>
+
+ * po/ja.po: Update from translation team.
+
+ 2011-05-23 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12795]
+ * sysdeps/unix/sysv/linux/bits/resource.h (RLIMIT_RTTIME): Define.
+ * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise.
+
2011-05-20 Andreas Schwab <schwab@redhat.com>
* stdlib/longlong.h: Update from GCC.
diff --cc NEWS
index 1558ba4,f6ab0db..2cdb0cc
--- a/NEWS
+++ b/NEWS
@@@ -17,7 -17,7 +17,7 @@@ Version 2.1
12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625, 12626,
12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, 12711, 12713,
12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, 12777,
- 12782, 12788, 12792, 12814
- 12782, 12788, 12792, 12795
++ 12782, 12788, 12792, 12795, 12814
* The RPC implementation in libc is obsoleted. Old programs keep working
but new programs cannot be linked with the routines in libc anymore.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e57420c6c67b914abb01f7c3b1d999795121ce70
commit e57420c6c67b914abb01f7c3b1d999795121ce70
Author: Ulrich Drepper <drepper@gmail.com>
Date: Fri May 27 08:35:44 2011 -0400
Add test for last iconv bug
diff --git a/ChangeLog b/ChangeLog
index beb8281..52a2b53 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 e0fe46a..94f860a 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 0000000..e4ffd59
--- /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"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4d07db153ea9acc5c3201647bd06024e5801ae89
commit 4d07db153ea9acc5c3201647bd06024e5801ae89
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri May 27 08:34:00 2011 -0400
Fix conversion to ISO-2022-JP-2 with ISO-8859-7 designation
diff --git a/ChangeLog b/ChangeLog
index 5f359bb..beb8281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-27 Andreas Schwab <schwab@redhat.com>
+
+ [BZ #12814]
+ * iconvdata/iso-2022-jp.c (BODY): Fix invalid variable shadowing.
+
2011-05-20 Andreas Schwab <schwab@redhat.com>
* stdlib/longlong.h: Update from GCC.
diff --git a/NEWS b/NEWS
index f3150f2..1558ba4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2011-5-22
+GNU C Library NEWS -- history of user-visible changes. 2011-5-27
Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -17,7 +17,7 @@ Version 2.14
12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625, 12626,
12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, 12711, 12713,
12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, 12777,
- 12782, 12788, 12792
+ 12782, 12788, 12792, 12814
* The RPC implementation in libc is obsoleted. Old programs keep working
but new programs cannot be linked with the routines in libc anymore.
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index e14b796..38e4f62 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -1,5 +1,5 @@
/* Conversion module for ISO-2022-JP and ISO-2022-JP-2.
- Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000-2002, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -664,7 +664,7 @@ static const cvlist_t conversion_lists[4] =
\
*outptr++ = ESC; \
*outptr++ = 'N'; \
- *outptr++ = res; \
+ *outptr++ = res & 0x7f; \
written = 3; \
} \
} \
@@ -706,7 +706,7 @@ static const cvlist_t conversion_lists[4] =
\
/* At the beginning of a line, G2 designation is cleared. */ \
if (var == iso2022jp2 && ch == 0x0a) \
- set2 = UNSPECIFIED_set; \
+ set2 = UNSPECIFIED_set; \
} \
else \
{ \
@@ -764,9 +764,9 @@ static const cvlist_t conversion_lists[4] =
++rp; \
if (ch >= rp->start) \
{ \
- unsigned char res = \
+ unsigned char ch2 = \
iso88597_from_ucs4[ch - 0xa0 + rp->idx]; \
- if (res != '\0') \
+ if (ch2 != '\0') \
{ \
if (set2 != ISO88597_set) \
{ \
@@ -789,7 +789,7 @@ static const cvlist_t conversion_lists[4] =
} \
*outptr++ = ESC; \
*outptr++ = 'N'; \
- *outptr++ = res; \
+ *outptr++ = ch2 - 0x80; \
res = __GCONV_OK; \
break; \
} \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++
NEWS | 4 +-
iconvdata/Makefile | 2 +-
iconvdata/bug-iconv9.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++
iconvdata/iso-2022-jp.c | 12 ++++----
5 files changed, 88 insertions(+), 9 deletions(-)
create mode 100644 iconvdata/bug-iconv9.c
hooks/post-receive
--
GNU C Library master sources