I wrote:
> FYI, I did most of the work to add FTS_CWDFD, just to see -- and it's
> not so bad, but the result is certainly less maintainable.
After saying the above, I figured I should produce the actual code,
so here it is. For now at least, I don't plan to check in these changes.
This patch restores most of the code removed by the latest
delta, in order to add an fts_open option, FTS_CWDFD, to
enable the new behavior (it may not be used with FTS_NOCHDIR).
This restores the original default behavior of using chdir/fchdir
when possible.
In restoring that removed code, I spotted a minor lingering bug.
Note the `// FIXME ...' comment, below.
In the version of fts.c before the thread-safe one, that close()
call would have clobbered errno. Of course, such a comment
would never be checked in -- not deliberately, at least.
FWIW, `make check' passes with and without this patch,
but the new test, tests/du/long-from-unreadable, fails if you
don't use the FTS_CWDFD option in xfts.c.
fts.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++----------------
fts_.h | 4 +
xfts.c | 4 -
3 files changed, 116 insertions(+), 37 deletions(-)
As I said, I'm reluctant to add this complexity,
without some evidence that it will be used.
Index: lib/fts_.h
===================================================================
RCS file: /fetish/cu/lib/fts_.h,v
retrieving revision 1.19
diff -u -p -r1.19 fts_.h
--- lib/fts_.h 17 Jan 2006 17:24:29 -0000 1.19
+++ lib/fts_.h 18 Jan 2006 21:21:36 -0000
@@ -72,6 +72,7 @@ typedef struct {
struct _ftsent **fts_array; /* sort array */
dev_t fts_dev; /* starting device # */
char *fts_path; /* file name for this descent */
+ int fts_rfd; /* fd for root */
int fts_cwd_fd; /* the file descriptor on which the
virtual cwd is open, or AT_FDCWD */
size_t fts_pathlen; /* sizeof(path) */
@@ -112,8 +113,9 @@ typedef struct {
So, when FTS_LOGICAL is selected, we have to use a different
mode of cycle detection: FTS_TIGHT_CYCLE_CHECK. */
# define FTS_TIGHT_CYCLE_CHECK 0x0100
+# define FTS_CWDFD 0x0200 /* FIXME */
-# define FTS_OPTIONMASK 0x01ff /* valid user option mask */
+# define FTS_OPTIONMASK 0x03ff /* valid user option mask */
# define FTS_NAMEONLY 0x1000 /* (private) child names only */
# define FTS_STOP 0x2000 /* (private) unrecoverable error */
Index: lib/fts.c
===================================================================
RCS file: /fetish/cu/lib/fts.c,v
retrieving revision 1.44
diff -u -p -r1.44 fts.c
--- lib/fts.c 17 Jan 2006 17:24:14 -0000 1.44
+++ lib/fts.c 19 Jan 2006 08:08:02 -0000
@@ -105,6 +105,8 @@ static char sccsid[] = "@(#)fts.c 8.6 (B
# define close __close
# undef closedir
# define closedir __closedir
+# undef fchdir
+# define fchdir __fchdir
# undef open
# define open __open
# undef opendir
@@ -178,8 +180,14 @@ static void free_dir (FTS *fts) {}
#define ISSET(opt) (sp->fts_options & (opt))
#define SET(opt) (sp->fts_options |= (opt))
-#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) \
- && (cwd_advance_fd (sp, fd), 0))
+#define RESTORE_INITIAL_CWD(sp) FCHDIR (sp, (ISSET (FTS_CWDFD) \
+ ? AT_FDCWD \
+ : sp->fts_rfd))
+
+#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) \
+ && (ISSET(FTS_CWDFD) \
+ ? (cwd_advance_fd (sp, fd), 0) \
+ : fchdir(fd)))
/* fts_build flags */
@@ -262,7 +270,9 @@ static inline int
internal_function
diropen (FTS const *sp, char const *dir)
{
- return diropen_fd (sp->fts_cwd_fd, dir);
+ return (ISSET(FTS_CWDFD)
+ ? diropen_fd (sp->fts_cwd_fd, dir)
+ : open (dir, O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK));
}
FTS *
@@ -281,6 +291,10 @@ fts_open (char * const *argv,
__set_errno (EINVAL);
return (NULL);
}
+ if ((options & FTS_NOCHDIR) && (options & FTS_CWDFD)) {
+ __set_errno (EINVAL);
+ return (NULL);
+ }
/* Allocate/initialize the stream */
if ((sp = malloc(sizeof(FTS))) == NULL)
@@ -290,12 +304,14 @@ fts_open (char * const *argv,
sp->fts_options = options;
/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
- if (ISSET(FTS_LOGICAL))
+ if (ISSET(FTS_LOGICAL)) {
SET(FTS_NOCHDIR);
+ CLR(FTS_CWDFD);
+ }
/* Initialize fts_cwd_fd. */
sp->fts_cwd_fd = AT_FDCWD;
- if ( ! ISSET(FTS_NOCHDIR) && ! HAVE_OPENAT_SUPPORT)
+ if ( ISSET(FTS_CWDFD) && ! HAVE_OPENAT_SUPPORT)
{
/* While it isn't technically necessary to open "." this
early, doing it here saves us the trouble of ensuring
@@ -318,7 +334,7 @@ fts_open (char * const *argv,
if ( openat_needs_fchdir ())
{
SET(FTS_NOCHDIR);
- sp->fts_cwd_fd = -1;
+ CLR(FTS_CWDFD);
}
}
else
@@ -396,6 +412,17 @@ fts_open (char * const *argv,
if (! setup_dir (sp))
goto mem3;
+ /*
+ * If using chdir(2), grab a file descriptor pointing to dot to ensure
+ * that we can get back here; this could be avoided for some file names,
+ * but almost certainly not worth the effort. Slashes, symbolic links,
+ * and ".." are all fairly nasty problems. Note, if we can't get the
+ * descriptor we run anyway, just more slowly.
+ */
+ if (!ISSET(FTS_NOCHDIR) && !ISSET(FTS_CWDFD)
+ && (sp->fts_rfd = diropen (sp, ".")) < 0)
+ SET(FTS_NOCHDIR);
+
return (sp);
mem3: fts_lfree(root);
@@ -457,8 +484,18 @@ fts_close (FTS *sp)
free(sp->fts_array);
free(sp->fts_path);
- if (0 <= sp->fts_cwd_fd)
- close (sp->fts_cwd_fd);
+ if (ISSET(FTS_CWDFD))
+ {
+ if (0 <= sp->fts_cwd_fd)
+ close (sp->fts_cwd_fd);
+ }
+ else if (!ISSET(FTS_NOCHDIR))
+ {
+ /* Return to original directory, save errno if necessary. */
+ if (fchdir(sp->fts_rfd))
+ saved_errno = errno;
+ close(sp->fts_rfd);
+ }
free_dir (sp);
@@ -598,7 +635,11 @@ next: tmp = p;
* root.
*/
if (p->fts_level == FTS_ROOTLEVEL) {
- FCHDIR(sp, AT_FDCWD);
+ if (RESTORE_INITIAL_CWD(sp)) {
+ SET(FTS_STOP);
+ sp->fts_cur = p;
+ return (NULL);
+ }
fts_load(sp, p);
goto check_for_dir;
}
@@ -657,15 +698,24 @@ check_for_dir:
sp->fts_path[p->fts_pathlen] = '\0';
/*
- * Return to the parent directory. If at a root node, just set
- * sp->fts_cwd_fd to AT_FDCWD. If we came through a symlink,
+ * Return to the parent directory. If at a root node, restore
+ * the initial working directory. If we came through a symlink,
* go back through the file descriptor. Otherwise, move up
* one level, via "..".
*/
if (p->fts_level == FTS_ROOTLEVEL) {
- FCHDIR(sp, AT_FDCWD);
+ if (RESTORE_INITIAL_CWD(sp)) {
+ p->fts_errno = errno;
+ SET(FTS_STOP);
+ }
} else if (p->fts_flags & FTS_SYMFOLLOW) {
- FCHDIR(sp, p->fts_symfd);
+ if (FCHDIR(sp, p->fts_symfd)) {
+ int saved_errno = errno;
+ (void)close(p->fts_symfd);
+ __set_errno (saved_errno);
+ p->fts_errno = errno;
+ SET(FTS_STOP);
+ }
(void)close(p->fts_symfd);
} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
@@ -758,7 +808,22 @@ fts_children (register FTS *sp, int inst
if ((fd = diropen (sp, ".")) < 0)
return (sp->fts_child = NULL);
sp->fts_child = fts_build(sp, instr);
- cwd_advance_fd (sp, fd);
+ if (ISSET(FTS_CWDFD))
+ {
+ cwd_advance_fd (sp, fd);
+ }
+ else
+ {
+ if (fchdir(fd))
+ {
+ // FIXME: save/restore is a fix over prev. version
+ int saved_errno = errno;
+ close (fd);
+ __set_errno (saved_errno);
+ return NULL;
+ }
+ close (fd);
+ }
return (sp->fts_child);
}
@@ -810,9 +875,9 @@ fts_build (register FTS *sp, int type)
oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
#else
# define __opendir2(file, flag) \
- (ISSET(FTS_NOCHDIR) \
- ? opendir(file) \
- : opendirat(sp->fts_cwd_fd, file))
+ ( ! ISSET(FTS_NOCHDIR) && ISSET(FTS_CWDFD) \
+ ? opendirat(sp->fts_cwd_fd, file) \
+ : opendir(file))
#endif
if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
if (type == BREAD) {
@@ -857,7 +922,9 @@ fts_build (register FTS *sp, int type)
*/
cderrno = 0;
if (nlinks || type == BREAD) {
- int dir_fd = dup (dirfd(dirp));
+ int dir_fd = dirfd(dirp);
+ if (ISSET(FTS_CWDFD) && 0 <= dir_fd)
+ dir_fd = dup (dir_fd);
if (dir_fd < 0 || fts_safe_changedir(sp, cur, dir_fd, NULL)) {
if (nlinks && type == BREAD)
cur->fts_errno = errno;
@@ -865,7 +932,7 @@ fts_build (register FTS *sp, int type)
descend = false;
cderrno = errno;
closedir(dirp);
- if (0 <= dir_fd)
+ if (ISSET(FTS_CWDFD) && 0 <= dir_fd)
close (dir_fd);
dirp = NULL;
} else
@@ -1026,9 +1093,9 @@ mem1: saved_errno = errno;
* can't get back, we're done.
*/
if (descend && (type == BCHILD || !nitems) &&
- (cur->fts_level == FTS_ROOTLEVEL ?
- FCHDIR(sp, AT_FDCWD) :
- fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
+ (cur->fts_level == FTS_ROOTLEVEL
+ ? RESTORE_INITIAL_CWD(sp)
+ : fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
cur->fts_info = FTS_ERR;
SET(FTS_STOP);
return (NULL);
@@ -1380,30 +1447,40 @@ static int
internal_function
fts_safe_changedir (FTS *sp, FTSENT *p, int fd, char const *dir)
{
+ int ret;
struct stat sb;
+
int newfd = fd;
if (ISSET(FTS_NOCHDIR)) {
- if (0 <= fd)
+ if (ISSET(FTS_CWDFD) && 0 <= fd)
close (fd);
return (0);
}
if (fd < 0 && (newfd = diropen (sp, dir)) < 0)
return (-1);
if (fstat(newfd, &sb)) {
- if (0 <= fd) {
- int saved_errno = errno;
- close (fd);
- errno = saved_errno;
- }
- return -1;
+ ret = -1;
+ goto bail;
}
if (p->fts_statp->st_dev != sb.st_dev
|| p->fts_statp->st_ino != sb.st_ino) {
- if (0 <= fd)
- close (fd);
__set_errno (ENOENT); /* disinformation */
- return -1;
+ ret = -1;
+ goto bail;
}
- cwd_advance_fd (sp, newfd);
- return 0;
+ if (ISSET(FTS_CWDFD))
+ {
+ cwd_advance_fd (sp, newfd);
+ return 0;
+ }
+
+ ret = fchdir(newfd);
+bail:
+ if (fd < 0)
+ {
+ int oerrno = errno;
+ (void)close(newfd);
+ __set_errno (oerrno);
+ }
+ return (ret);
}
Index: lib/xfts.c
===================================================================
RCS file: /fetish/cu/lib/xfts.c,v
retrieving revision 1.3
diff -u -p -r1.3 xfts.c
--- lib/xfts.c 24 Sep 2005 13:33:08 -0000 1.3
+++ lib/xfts.c 18 Jan 2006 21:29:18 -0000
@@ -1,6 +1,6 @@
/* xfts.c -- a wrapper for fts_open
- Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ FTS *
xfts_open (char * const *argv, int options,
int (*compar) (const FTSENT **, const FTSENT **))
{
- FTS *fts = fts_open (argv, options, compar);
+ FTS *fts = fts_open (argv, options | FTS_CWDFD, compar);
if (fts == NULL)
{
/* This can fail in three ways: out of memory, invalid bit_flags,
_______________________________________________
bug-gnulib mailing list
bug-gnulib@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnulib
