lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Avoid dup3 PLT usage.

Browse Source 
Fixes fallout from 5aa3a74a59.
This commit is contained in:
Thomas Schwinge
2012-05-12 10:53:04 +08:00
parent 9fb1a21f4d
commit dc70356cbf
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-12 Thomas Schwinge <thomas@codesourcery.com>
* 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@intel.com> 2012-05-11 H.J. Lu <hongjiu.lu@intel.com>
* elf/stackguard-macros.h (STACK_CHK_GUARD) [__x86_64__]: Use * elf/stackguard-macros.h (STACK_CHK_GUARD) [__x86_64__]: Use

5
io/dup3.c
View File

@ -24,7 +24,7 @@
open the same file as FD is which setting flags according to open the same file as FD is which setting flags according to
FLAGS. Return FD2 or -1. */ FLAGS. Return FD2 or -1. */
int int
dup3 (fd, fd2, flags) __dup3 (fd, fd2, flags)
int fd; int fd;
int fd2; int fd2;
int flags; int flags;
@ -42,7 +42,8 @@ dup3 (fd, fd2, flags)
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;
} }
libc_hidden_def (dup3) libc_hidden_def (__dup3)
weak_alias (__dup3, dup3)
stub_warning (dup3) stub_warning (dup3)
#include <stub-tag.h> #include <stub-tag.h>

6
libio/freopen.c
View File

@ -89,9 +89,9 @@ freopen (filename, mode, fp)
else else
newfd = newfd =
# endif # endif
dup3 (_IO_fileno (result), fd, __dup3 (_IO_fileno (result), fd,
(result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0 (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
? O_CLOEXEC : 0); ? O_CLOEXEC : 0);
#else #else
# define newfd 1 # define newfd 1
#endif #endif

6
libio/freopen64.c
View File

@ -73,9 +73,9 @@ freopen64 (filename, mode, fp)
else else
newfd = newfd =
# endif # endif
dup3 (_IO_fileno (result), fd, __dup3 (_IO_fileno (result), fd,
(result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0 (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
? O_CLOEXEC : 0); ? O_CLOEXEC : 0);
#else #else
# define newfd 1 # define newfd 1
#endif #endif

2
sysdeps/unix/syscalls.list
View File

@ -10,7 +10,7 @@ chroot - chroot i:s chroot
close - close Ci:i __libc_close __close close close - close Ci:i __libc_close __close close
dup - dup i:i __dup dup dup - dup i:i __dup dup
dup2 - dup2 i:ii __dup2 dup2 dup2 - dup2 i:ii __dup2 dup2
dup3 - dup3 i:iii dup3 dup3 - dup3 i:iii __dup3 dup3
fchdir - fchdir i:i __fchdir fchdir fchdir - fchdir i:i __fchdir fchdir
fchmod - fchmod i:ii __fchmod fchmod fchmod - fchmod i:ii __fchmod fchmod
fchown - fchown i:iii __fchown fchown fchown - fchown i:iii __fchown fchown