public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [hurd,commited] Revert __dirfd PLT avoidance for now
Date: Mon, 02 Apr 2018 19:47:00 -0000	[thread overview]
Message-ID: <20180402194702.24270-1-samuel.thibault@ens-lyon.org> (raw)

* io/fts.c (fts_build): Call dirfd instead of __dirfd.
---
 ChangeLog | 1 -
 io/fts.c  | 2 +-
 2 files changed, 1 insertion(+), 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;
-- 
2.16.2

                 reply	other threads:[~2018-04-02 19:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180402194702.24270-1-samuel.thibault@ens-lyon.org \
    --to=samuel.thibault@ens-lyon.org \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).