OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Joseph Myers 2014-11-12 16:24:16 +00:00
parent 5a6fa4d7ed
commit 2f5c1b000a
7 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,5 +1,21 @@
2014-11-12 Joseph Myers <joseph@codesourcery.com>
[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.
[BZ #17583]
* libio/fileno.c (fileno): Rename to __fileno and define as weak
alias of __fileno. Use libc_hidden_weak.

2
NEWS
View File

@ -11,7 +11,7 @@ Version 2.21
6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363,
17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
17555, 17583.
17555, 17583, 17584.
* New locales: tu_IN, bh_IN.

5
dirent/rewinddir.c
View File

@ -22,13 +22,14 @@
/* Rewind DIRP to the beginning of the directory. */
void
rewinddir (dirp)
__rewinddir (dirp)
DIR *dirp;
{
__set_errno (ENOSYS);
/* No way to indicate failure. */
}
libc_hidden_def (rewinddir)
libc_hidden_def (__rewinddir)
weak_alias (__rewinddir, rewinddir)
stub_warning (rewinddir)

3
include/dirent.h
View File

@ -47,8 +47,9 @@ extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
const struct stat64 *statp)
internal_function;
extern void __scandir_cancel_handler (void *arg);
extern __typeof (rewinddir) __rewinddir;
libc_hidden_proto (rewinddir)
libc_hidden_proto (__rewinddir)
libc_hidden_proto (scandirat)
libc_hidden_proto (scandirat64)
# endif

5
sysdeps/mach/hurd/rewinddir.c
View File

@ -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)

6
sysdeps/posix/getcwd.c
View File

@ -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;
}

5
sysdeps/posix/rewinddir.c
View File

@ -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)