GNU C Library master sources branch, master, updated. glibc-2.15-99-g83cf1b9

[drepper at sourceware dot org]

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  83cf1b9f0244a6c6b420de88f19d707f2c2e5247 (commit)
       via  b15549e6f8d5936c4312b022ac8910823f2c2280 (commit)
      from  a037381ff8223ef35e225152802bf0cbf4612103 (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=83cf1b9f0244a6c6b420de88f19d707f2c2e5247

commit 83cf1b9f0244a6c6b420de88f19d707f2c2e5247
Merge: b15549e a037381
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Tue Jan 24 19:29:39 2012 -0500

    Merge branch 'master' of ssh://sourceware.org/git/glibc
    
    Conflicts:
    	ChangeLog

diff --cc ChangeLog
index 1887ec2,729ee72..ffd4224
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,22 +1,29 @@@
 +2012-01-24  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* include/stdio.h: Add C++ protection.  Add gets declarations and
 +	definitions.
 +	* debug/tst-chk1.c: Don't declare gets here.
 +	* stdio-common/tst-gets.c: Likewise.
 +
+ 2012-01-24  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* posix/glob: Remove directory.
+ 
+ 2012-01-24  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* wcsmbs/Makefile (tst-c16c32-1-ENV): Define.
+ 
+ 2012-01-22  Pino Toscano  <toscano.pino@tiscali.it>
+ 
+ 	* sysdeps/mach/hurd/socket.c (__socket): Return EAFNOSUPPORT instead
+ 	of the non-standard EPFNOSUPPORT.
+ 
+ 2011-12-26  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+ 
+ 	* sysdeps/mach/hurd/mmap.c (__mmap): When MAPADDR is nonzero, try
+ 	__vm_allocate and __vm_map with ANYWHERE set to 0 first, and try with
+ 	ANYWHERE set to 1 only on KERN_NO_SPACE error.
+ 
  2012-01-21  Ulrich Drepper  <drepper@gmail.com>
  
  	* wcsmbs/uchar.h: Test __STDC_VERSION__.

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b15549e6f8d5936c4312b022ac8910823f2c2280

commit b15549e6f8d5936c4312b022ac8910823f2c2280
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Tue Jan 24 17:40:44 2012 -0500

    Fix gets problems

diff --git a/ChangeLog b/ChangeLog
index f0f3017..1887ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-24  Ulrich Drepper  <drepper@gmail.com>
+
+	* include/stdio.h: Add C++ protection.  Add gets declarations and
+	definitions.
+	* debug/tst-chk1.c: Don't declare gets here.
+	* stdio-common/tst-gets.c: Likewise.
+
 2012-01-21  Ulrich Drepper  <drepper@gmail.com>
 
 	* wcsmbs/uchar.h: Test __STDC_VERSION__.
diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 2593ab9..21419ee 100644
--- a/debug/tst-chk1.c
+++ b/debug/tst-chk1.c
@@ -34,11 +34,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-__BEGIN_DECLS
-/* The <stdio.h> header does not include the declaration for gets
-   anymore when compiling with _GNU_SOURCE.  Provide a copy here.  */
-extern char *gets (char *__s);
-__END_DECLS
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
diff --git a/include/stdio.h b/include/stdio.h
index 5f4495d..48aa765 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -5,6 +5,8 @@
 #  include <libio/stdio.h>
 
 /* Now define the internal interfaces.  */
+__BEGIN_DECLS
+
 extern int __fcloseall (void);
 extern int __snprintf (char *__restrict __s, size_t __maxlen,
 		       const char *__restrict __format, ...)
@@ -164,6 +166,26 @@ libc_hidden_proto (__vfprintf_chk)
 libc_hidden_proto (__vasprintf_chk)
 libc_hidden_proto (__vdprintf_chk)
 libc_hidden_proto (__obstack_vprintf_chk)
+
+/* The <stdio.h> header does not include the declaration for gets
+   anymore when compiling with _GNU_SOURCE.  Provide a copy here.  */
+extern char *gets (char *__s);
+#  if __USE_FORTIFY_LEVEL > 0
+extern char *__gets_chk (char *__str, size_t) __wur;
+extern char *__REDIRECT (__gets_warn, (char *__str), gets)
+     __wur __warnattr ("please use fgets or getline instead, gets can't "
+		       "specify buffer size");
+
+__extern_always_inline __wur char *
+gets (char *__str)
+{
+  if (__bos (__str) != (size_t) -1)
+    return __gets_chk (__str, __bos (__str));
+  return __gets_warn (__str);
+}
+#  endif
+
+__END_DECLS
 # endif
 
 #endif
diff --git a/stdio-common/tst-gets.c b/stdio-common/tst-gets.c
index 463f345..7975893 100644
--- a/stdio-common/tst-gets.c
+++ b/stdio-common/tst-gets.c
@@ -1,5 +1,5 @@
 /* Tests for gets.
-   Copyright (C) 2001, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2011, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
@@ -21,10 +21,6 @@
 #include <stdio.h>
 #include <string.h>
 
-/* The <stdio.h> header does not include the declaration for gets
-   anymore when compiling with _GNU_SOURCE.  Provide a copy here.  */
-extern char *gets (char *__s);
-
 
 int
 main (void)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |    7 +++++++
 debug/tst-chk1.c        |    5 -----
 include/stdio.h         |   22 ++++++++++++++++++++++
 stdio-common/tst-gets.c |    6 +-----
 4 files changed, 30 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources