From patchwork Mon Apr 2 19:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26556 Received: (qmail 25653 invoked by alias); 2 Apr 2018 19:47:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 25643 invoked by uid 89); 2 Apr 2018 19:47:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] Revert __dirfd PLT avoidance for now Date: Mon, 2 Apr 2018 21:47:02 +0200 Message-Id: <20180402194702.24270-1-samuel.thibault@ens-lyon.org> * 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 . (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;