From 79a3d2d10ebf29fb4e73716ae1b72fc5d20486a5 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 16 Aug 2011 20:20:30 +0200 Subject: [PATCH] maint: fts: give __opendir2 a new parameter and rename * lib/fts.c (__opendir2): Give it a new parameter, Pdir_fd, rather than surreptitiously using sole caller's "dir_fd". (fts_opendir): Rename from __opendir2. --- ChangeLog | 5 +++++ lib/fts.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 414186a04..8fefc14ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-08-19 Jim Meyering + maint: fts: give __opendir2 a new parameter and rename + * lib/fts.c (__opendir2): Give it a new parameter, Pdir_fd, rather + than surreptitiously using sole caller's "dir_fd". + (fts_opendir): Rename from __opendir2. + maint: fts.c: remove __opendir2's now-unused parameter, oflag * lib/fts.c (__opendir2): Remove unused parameter, oflag. diff --git a/lib/fts.c b/lib/fts.c index b8b7c5a40..e600a99e8 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -1192,7 +1192,7 @@ set_stat_type (struct stat *st, unsigned int dtype) st->st_mode = type; } -# define __opendir2(file) \ +#define fts_opendir(file, Pdir_fd) \ opendirat((! ISSET(FTS_NOCHDIR) && ISSET(FTS_CWDFD) \ ? sp->fts_cwd_fd : AT_FDCWD), \ file, \ @@ -1201,7 +1201,7 @@ set_stat_type (struct stat *st, unsigned int dtype) && cur->fts_level == FTS_ROOTLEVEL)) \ ? O_NOFOLLOW : 0) \ | (ISSET (FTS_NOATIME) ? O_NOATIME : 0)), \ - &dir_fd) + Pdir_fd) /* * This is the tricky part -- do not casually change *anything* in here. The @@ -1242,7 +1242,7 @@ fts_build (register FTS *sp, int type) /* Open the directory for reading. If this fails, we're done. If being called from fts_read, set the fts_info field. */ - if ((dirp = __opendir2(cur->fts_accpath)) == NULL) { + if ((dirp = fts_opendir(cur->fts_accpath, &dir_fd)) == NULL) { if (type == BREAD) { cur->fts_info = FTS_DNR; cur->fts_errno = errno; -- 2.11.0