From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 2 Apr 2018 19:45:38 +0000 (+0200)
Subject: Revert __dirfd PLT avoidance for now
X-Git-Tag: glibc-2.28~411
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97c7a6a68beab2e1c771ab7787607c6cafa56591;p=thirdparty%2Fglibc.git

Revert __dirfd PLT avoidance for now

* io/fts.c (fts_build): Call dirfd instead of __dirfd.
---

diff --git a/ChangeLog b/ChangeLog
index e63f9878e9e..cbc98364a04 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 a30491c230c..ad9d333f456 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;