Skip to content

Add conditional handling for fchdir and chdir functions #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kateinoigakukun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add conditional handling for fchdir and chdir functions #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions fts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,15 @@ static int fts_safe_changedir(const FTS *, const FTSENT *, int,
#define ISSET(opt) (sp->fts_options & (opt))
#define SET(opt) (sp->fts_options |= (opt))

#if HAVE_FCHDIR
#define CHDIR(sp, path) (!ISSET(FTS_NOCHDIR) && chdir(path))
#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
#else
/* If we don't have fchdir, pretend that !ISSET(FTS_NOCHDIR) is always false in
* the above macros, and do not reference chdir or fchdir. */
#define CHDIR(sp, path) 0
#define FCHDIR(sp, fd) 0
#endif

/* fts_build flags */
#define BCHILD 1 /* fts_children */
Expand All @@ -136,6 +143,11 @@ fts_open(char * const *argv, int options,

_DIAGASSERT(argv != NULL);

#if !HAVE_FCHDIR
/* If we don't have fchdir, pretend that FTS_NOCHDIR is always set. */
options |= FTS_NOCHDIR;
#endif

/* Options check. */
if (options & ~FTS_OPTIONMASK) {
errno = EINVAL;
Expand Down Expand Up @@ -299,12 +311,14 @@ fts_close(FTS *sp)
free(sp->fts_array);
free(sp->fts_path);

#if HAVE_FCHDIR
/* Return to original directory, save errno if necessary. */
if (!ISSET(FTS_NOCHDIR)) {
if (fchdir(sp->fts_rfd) == -1)
saved_errno = errno;
(void)close(sp->fts_rfd);
}
#endif

/* Free up the stream pointer. */
free(sp);
Expand Down Expand Up @@ -611,6 +625,7 @@ fts_children(FTS *sp, int instr)
} else
instr = BCHILD;

#if HAVE_FCHDIR
/*
* If using chdir on a relative path and called BEFORE fts_read does
* its chdir to the root of a traversal, we can lose -- we need to
Expand All @@ -631,6 +646,10 @@ fts_children(FTS *sp, int instr)
}
(void)close(fd);
return (sp->fts_child);
#else
/* If not using chdir, just build the list. */
return (sp->fts_child = fts_build(sp, instr));
#endif
}

/*
Expand Down Expand Up @@ -1226,6 +1245,7 @@ fts_maxarglen(char * const *argv)
static int
fts_safe_changedir(const FTS *sp, const FTSENT *p, int fd, const char *path)
{
#if HAVE_FCHDIR
int oldfd = fd, ret = -1;
__fts_stat_t sb;

Expand All @@ -1252,4 +1272,8 @@ fts_safe_changedir(const FTS *sp, const FTSENT *p, int fd, const char *path)
errno = save_errno;
}
return ret;
#else
/* If we can't do fchdir, pretend as if ISSET(FTS_NOCHDIR) is set. */
return 0;
#endif
}