diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-12 16:24:16 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-12 16:24:16 +0000 |
| commit | 2f5c1b000aaeb2c25b1df52453bba8de7f9453e2 (patch) | |
| tree | 523dac74393fcf0967b6b7ec683848b4dfbed877 /sysdeps | |
| parent | 5a6fa4d7ed465c2f7da9d73004c972519dc2100e (diff) | |
| download | glibc-2f5c1b000aaeb2c25b1df52453bba8de7f9453e2.zip glibc-2f5c1b000aaeb2c25b1df52453bba8de7f9453e2.tar.gz glibc-2f5c1b000aaeb2c25b1df52453bba8de7f9453e2.tar.bz2 | |
Fix __getcwd rewinddir namespace (bug 17584).
__getcwd is called from dcigettext.o (brought in by various ISO C
functionality), but calls rewinddir, which is not an ISO C function.
This patch makes __getcwd call __rewinddir instead and makes rewinddir
a weak alias for __rewinddir.
Since getcwd.c is shared with gnulib (albeit not merged in either
direction for a long time, and omitted from gnulib's
config/srclist.txt list of shared files) I put in a #ifndef _LIBC
define of __rewinddir to rewinddir, although a future merged version
of getcwd could end up looking significantly different.
Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by this patch).
[BZ #17584]
* dirent/rewinddir.c (rewinddir): Rename to __rewinddir and define
as weak alias of __rewinddir. Don't use libc_hidden_def.
(__rewinddir): Use libc_hidden_def.
* sysdeps/mach/hurd/rewinddir.c: Rename to __rewinddir and define
as weak alias of __rewinddir. Don't use libc_hidden_def.
(__rewinddir): Use libc_hidden_def.
* sysdeps/posix/rewinddir.c: Rename to __rewinddir and define as
weak alias of __rewinddir. Don't use libc_hidden_def.
(__rewinddir): Use libc_hidden_def.
* include/dirent.h (rewinddir): Don't use libc_hidden_proto.
(__rewinddir): Use libc_hidden_proto.
* sysdeps/posix/getcwd.c [!_LIBC] (__rewinddir): Define to
rewinddir.
(__getcwd): Use __rewinddir instead of rewinddir.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/rewinddir.c | 5 | ||||
| -rw-r--r-- | sysdeps/posix/getcwd.c | 6 | ||||
| -rw-r--r-- | sysdeps/posix/rewinddir.c | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/rewinddir.c b/sysdeps/mach/hurd/rewinddir.c index bccd549..284a48b 100644 --- a/sysdeps/mach/hurd/rewinddir.c +++ b/sysdeps/mach/hurd/rewinddir.c @@ -22,9 +22,10 @@ /* Rewind DIRP to the beginning of the directory. */ void -rewinddir (dirp) +__rewinddir (dirp) DIR *dirp; { seekdir (dirp, (off_t) 0L); } -libc_hidden_def (rewinddir) +libc_hidden_def (__rewinddir) +weak_alias (__rewinddir, rewinddir) diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c index 6201916..92cb22e 100644 --- a/sysdeps/posix/getcwd.c +++ b/sysdeps/posix/getcwd.c @@ -195,6 +195,10 @@ extern char *alloca (); #ifndef __GNU_LIBRARY__ # define __lstat64 stat64 #endif + +#ifndef _LIBC +# define __rewinddir rewinddir +#endif #ifndef _LIBC # define __getcwd getcwd @@ -390,7 +394,7 @@ __getcwd (buf, size) if (use_d_ino) { use_d_ino = false; - rewinddir (dirstream); + __rewinddir (dirstream); continue; } diff --git a/sysdeps/posix/rewinddir.c b/sysdeps/posix/rewinddir.c index 5a4a715..e9bc78d 100644 --- a/sysdeps/posix/rewinddir.c +++ b/sysdeps/posix/rewinddir.c @@ -23,7 +23,7 @@ /* Rewind DIRP to the beginning of the directory. */ void -rewinddir (dirp) +__rewinddir (dirp) DIR *dirp; { #ifndef NOT_IN_libc @@ -38,4 +38,5 @@ rewinddir (dirp) __libc_lock_unlock (dirp->lock); #endif } -libc_hidden_def (rewinddir) +libc_hidden_def (__rewinddir) +weak_alias (__rewinddir, rewinddir) |