[Commits] r20411 - in /fsf/trunk/libc: ./ scripts/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Aug 30 00:01:54 2012
New Revision: 20411

Log:
Import glibc-mainline for 2012-08-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makefile
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/scripts/test-installation.pl
    fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname_r.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Aug 30 00:01:54 2012
@@ -1,3 +1,19 @@
+2012-08-29  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14476]
+	* Makefile (install): Also pass LD_SO=$(ld.so-version) to
+	scripts/test-installation.pl.
+
+	* scripts/test-installation.pl: Use LD_SO to get $ld_so_name
+	and $ld_so_version if it is set.
+
+2012-08-29  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	[BZ #14516]
+	* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Don't return
+	failure if reading from procfs failed.
+	* sysdeps/unix/sysv/linux/ttyname_r.c (ttyname_r): Likewise.
+
 2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h

Modified: fsf/trunk/libc/Makefile
==============================================================================
--- fsf/trunk/libc/Makefile (original)
+++ fsf/trunk/libc/Makefile Thu Aug 30 00:01:54 2012
@@ -111,7 +111,7 @@
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-	CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
+	LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Thu Aug 30 00:01:54 2012
@@ -12,7 +12,7 @@
   3479, 5400, 6778, 6808, 9685, 11607, 13717, 13696, 13939, 14042, 14090,
   14166, 14150, 14151, 14154, 14157, 14166, 14173, 14195, 14252, 14283,
   14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459,
-  14505, 14519
+  14476, 14505, 14516, 14519
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
@@ -39,6 +39,10 @@
   never attempts to contact the Name Service Caching Daemon (nscd).
   New configure option --disable-build-nscd avoids building nscd itself;
   this is the default if --disable-nscd is used.
+
+* The ttyname and ttyname_r functions on Linux now fall back to searching for
+  the tty file descriptor in /dev/pts or /dev if /proc is not available.  This
+  allows creation of chroots without the procfs mounted on /proc.
 
 
 Version 2.16

Modified: fsf/trunk/libc/scripts/test-installation.pl
==============================================================================
--- fsf/trunk/libc/scripts/test-installation.pl (original)
+++ fsf/trunk/libc/scripts/test-installation.pl Thu Aug 30 00:01:54 2012
@@ -24,6 +24,11 @@
   $CC = $ENV{CC};
 } else {
   $CC= "gcc";
+}
+if ($ENV{LD_SO}) {
+  $LD_SO = $ENV{LD_SO};
+} else {
+  $LD_SO = "";
 }
 
 sub usage {
@@ -112,6 +117,8 @@
       $link_libs .= " -l$name";
       $versions{$name} = $version;
     }
+  } elsif ($LD_SO ne "") {
+    ($ld_so_name, $ld_so_version) = split ('\.so\.', $LD_SO);
   } else {
     if (/^ld\.so/) {
       ($ld_so_name, $ld_so_version)= /=(.*)\.so\.(.*)$/;

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname.c Thu Aug 30 00:01:54 2012
@@ -148,12 +148,6 @@
     }
 
   ssize_t len = __readlink (procname, ttyname_buf, buflen);
-  if (__builtin_expect (len == -1 && errno == ENOENT, 0))
-    {
-      __set_errno (EBADF);
-      return NULL;
-    }
-
   if (__builtin_expect (len != -1, 1))
     {
       if ((size_t) len >= buflen)

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname_r.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname_r.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ttyname_r.c Thu Aug 30 00:01:54 2012
@@ -128,12 +128,6 @@
   *_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0';
 
   ssize_t ret = __readlink (procname, buf, buflen - 1);
-  if (__builtin_expect (ret == -1 && errno == ENOENT, 0))
-    {
-      __set_errno (EBADF);
-      return EBADF;
-    }
-
   if (__builtin_expect (ret == -1 && errno == ENAMETOOLONG, 0))
     {
       __set_errno (ERANGE);

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits