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.20-180-gcc67478
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Nov 2014 22:42:57 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-180-gcc67478
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 cc67478e282ac5c46a1005474cca51342efe1397 (commit)
from 9975e3d37d8585b41db075321bade3495cf58cdb (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cc67478e282ac5c46a1005474cca51342efe1397
commit cc67478e282ac5c46a1005474cca51342efe1397
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Nov 12 22:42:22 2014 +0000
Fix localealias.c fgets_unlocked namespace (bug 17589).
intl/localealias.c is brought in by ISO C functions, but uses
fgets_unlocked, which is not an ISO C function. This patch changes
this to use __fgets_unlocked.
Tested for x86_64 (testsuite, and that stripped installed shared
libraries are unchanged by the patch).
[BZ #17589]
* intl/localealias.c [_LIBC] (FGETS): Use __fgets_unlocked instead
of fgets_unlocked.
diff --git a/ChangeLog b/ChangeLog
index 9ef0907..177a6d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-11-12 Joseph Myers <joseph@codesourcery.com>
+ [BZ #17589]
+ * intl/localealias.c [_LIBC] (FGETS): Use __fgets_unlocked instead
+ of fgets_unlocked.
+
[BZ #17585]
* string/memmem.c [!_LIBC] (__memmem): Define to memmem.
(memmem): Rename to __memmem and define as weak alias of
diff --git a/NEWS b/NEWS
index 27969e0..918b4a1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,8 @@ Version 2.21
6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363,
17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
- 17555, 17570, 17571, 17572, 17573, 17574, 17582, 17583, 17584, 17585.
+ 17555, 17570, 17571, 17572, 17573, 17574, 17582, 17583, 17584, 17585,
+ 17589.
* New locales: tu_IN, bh_IN.
diff --git a/intl/localealias.c b/intl/localealias.c
index 9ab4328..1d3f8eb 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -84,7 +84,7 @@ __libc_lock_define_initialized (static, lock);
/* Some optimizations for glibc. */
#ifdef _LIBC
# define FEOF(fp) feof_unlocked (fp)
-# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
+# define FGETS(buf, n, fp) __fgets_unlocked (buf, n, fp)
#else
# define FEOF(fp) feof (fp)
# define FGETS(buf, n, fp) fgets (buf, n, fp)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
NEWS | 3 ++-
intl/localealias.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources