[Commits] r18506 - in /fsf/trunk/libc: ChangeLog io/dup3.c libio/freopen.c libio/freopen64.c sysdeps/unix/syscalls.list

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat May 12 14:35:24 2012
New Revision: 18506

Log:
Import glibc-mainline for 2012-05-12

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/io/dup3.c
    fsf/trunk/libc/libio/freopen.c
    fsf/trunk/libc/libio/freopen64.c
    fsf/trunk/libc/sysdeps/unix/syscalls.list

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat May 12 14:35:24 2012
@@ -1,3 +1,10 @@
+2012-05-12  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
+
+	* io/dup3.c (dup3): Rename to __dup3, add weak alias for dup3.
+	* sysdeps/unix/syscalls.list (dup3): Likewise.
+	* libio/freopen.c (freopen): Invoke __dup3 instead of dup3.
+	* libio/freopen64.c (freopen64): Invoke __dup3 instead of dup3.
+
 2012-05-11  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	* elf/stackguard-macros.h (STACK_CHK_GUARD) [__x86_64__]: Use

Modified: fsf/trunk/libc/io/dup3.c
==============================================================================
--- fsf/trunk/libc/io/dup3.c (original)
+++ fsf/trunk/libc/io/dup3.c Sat May 12 14:35:24 2012
@@ -24,7 +24,7 @@
    open the same file as FD is which setting flags according to
    FLAGS.  Return FD2 or -1.  */
 int
-dup3 (fd, fd2, flags)
+__dup3 (fd, fd2, flags)
      int fd;
      int fd2;
      int flags;
@@ -42,7 +42,8 @@
   __set_errno (ENOSYS);
   return -1;
 }
-libc_hidden_def (dup3)
+libc_hidden_def (__dup3)
+weak_alias (__dup3, dup3)
 stub_warning (dup3)
 
 #include <stub-tag.h>

Modified: fsf/trunk/libc/libio/freopen.c
==============================================================================
--- fsf/trunk/libc/libio/freopen.c (original)
+++ fsf/trunk/libc/libio/freopen.c Sat May 12 14:35:24 2012
@@ -89,9 +89,9 @@
 	  else
 	    newfd =
 # endif
-	      dup3 (_IO_fileno (result), fd,
-		    (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
-		    ? O_CLOEXEC : 0);
+	      __dup3 (_IO_fileno (result), fd,
+                      (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
+                      ? O_CLOEXEC : 0);
 #else
 # define newfd 1
 #endif

Modified: fsf/trunk/libc/libio/freopen64.c
==============================================================================
--- fsf/trunk/libc/libio/freopen64.c (original)
+++ fsf/trunk/libc/libio/freopen64.c Sat May 12 14:35:24 2012
@@ -73,9 +73,9 @@
 	  else
 	    newfd =
 # endif
-	      dup3 (_IO_fileno (result), fd,
-		    (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
-		    ? O_CLOEXEC : 0);
+	      __dup3 (_IO_fileno (result), fd,
+                      (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
+                      ? O_CLOEXEC : 0);
 #else
 # define newfd 1
 #endif

Modified: fsf/trunk/libc/sysdeps/unix/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/syscalls.list Sat May 12 14:35:24 2012
@@ -10,7 +10,7 @@
 close		-	close		Ci:i	__libc_close	__close close
 dup		-	dup		i:i	__dup		dup
 dup2		-	dup2		i:ii	__dup2		dup2
-dup3		-	dup3		i:iii	dup3
+dup3		-	dup3		i:iii	__dup3		dup3
 fchdir		-	fchdir		i:i	__fchdir	fchdir
 fchmod		-	fchmod		i:ii	__fchmod	fchmod
 fchown		-	fchown		i:iii	__fchown	fchown

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