diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-02 21:45:38 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-02 21:45:38 +0200 |
| commit | 97c7a6a68beab2e1c771ab7787607c6cafa56591 (patch) | |
| tree | 8e051d9b0a69733fbf2c41ccda3d95a42f190f9c | |
| parent | dba2bdbe75bcb62e62133b7c4a807a2c45c098a7 (diff) | |
| download | glibc-97c7a6a68beab2e1c771ab7787607c6cafa56591.tar.gz glibc-97c7a6a68beab2e1c771ab7787607c6cafa56591.tar.xz glibc-97c7a6a68beab2e1c771ab7787607c6cafa56591.zip | |
Revert __dirfd PLT avoidance for now
* io/fts.c (fts_build): Call dirfd instead of __dirfd.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | io/fts.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index e63f9878e9..cbc98364a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -317,7 +317,6 @@ (_hurd_siginfo_handler): Call _IO_puts instead of puts. * hurd/xattr.c (_hurd_xattr_get, _hurd_xattr_set): Call __munmap instead of munmap. - * io/fts.c (fts_build): Call __dirfd instead of dirfd. * mach/devstream.c: Include <libioP.h>. (dealloc_ref): Call __mach_port_deallocate instead of mach_port_deallocate. diff --git a/io/fts.c b/io/fts.c index a30491c230..ad9d333f45 100644 --- a/io/fts.c +++ b/io/fts.c @@ -680,7 +680,7 @@ fts_build (FTSOBJ *sp, int type) */ cderrno = 0; if (nlinks || type == BREAD) { - if (fts_safe_changedir(sp, cur, __dirfd(dirp), NULL)) { + if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { if (nlinks && type == BREAD) cur->fts_errno = errno; cur->fts_flags |= FTS_DONTCHDIR; |