Skip to content

fts: refactor to use fd-relative operations internally #2278

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
Jeetubhati wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −6
Open

fts: refactor to use fd-relative operations internally #2278

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e051508
fts: refactor to use fd-relative operations internally
Jeetubhati Jun 12, 2026
6cf9dd9
fts: fix _openat() usage in mid-traversal CWD saves
Jeetubhati Jun 13, 2026
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
17 changes: 11 additions & 6 deletions lib/libc/gen/fts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ static int fts_ufslinks(FTS *, const FTSENT *);
#define SET(opt) (sp->fts_options |= (opt))

#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
#define FTSP(sp) ((struct _fts_private *)(sp))
#define ROOTFD(sp) (FTSP(sp)->ftsp_rootfd)

/* fts_build flags */
#define BCHILD 1 /* fts_children */
Expand All @@ -97,6 +99,7 @@ struct _fts_private {
struct statfs ftsp_statfs;
dev_t ftsp_dev;
int ftsp_linksreliable;
int ftsp_rootfd;

@asomers asomers Jun 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add a new file descriptor, instead of reusing fts_rfd?

};

/*
Expand Down Expand Up @@ -212,9 +215,9 @@ __fts_open(FTS *sp, char * const *argv)
* descriptor we run anyway, just more slowly.
*/
if (!ISSET(FTS_NOCHDIR) &&
(sp->fts_rfd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
(sp->fts_rfd = _openat(ROOTFD(sp), ".", O_RDONLY |
O_CLOEXEC, 0)) < 0)
SET(FTS_NOCHDIR);

return (sp);

mem3: fts_lfree(root);
Expand Down Expand Up @@ -246,6 +249,7 @@ fts_open(char * const *argv, int options,
/* Allocate/initialize the stream. */
if ((priv = calloc(1, sizeof(*priv))) == NULL)
return (NULL);
priv->ftsp_rootfd = AT_FDCWD;

@asomers asomers Jun 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only going to work for small directory trees. For larger ones, fts might internally chdir. Then AT_FDCWD would be pointing to the wrong place. So it would be better to use an actual file descriptor. Like fts_rfd. Why can't you just use that?

sp = &priv->ftsp_fts;
sp->fts_compar = compar;
sp->fts_options = options;
Expand Down Expand Up @@ -439,8 +443,8 @@ fts_read(FTS *sp)
(p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
p->fts_info = fts_stat(sp, p, 1, -1);
if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
if ((p->fts_symfd = _open(".", O_RDONLY | O_CLOEXEC,
0)) < 0) {
if ((p->fts_symfd = _openat(AT_FDCWD, ".",
O_RDONLY | O_CLOEXEC, 0)) < 0) {
p->fts_errno = errno;
p->fts_info = FTS_ERR;
} else
Expand Down Expand Up @@ -532,7 +536,8 @@ next: tmp = p;
p->fts_info = fts_stat(sp, p, 1, -1);
if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
if ((p->fts_symfd =
_open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) {
_openat(AT_FDCWD, ".", O_RDONLY |
O_CLOEXEC, 0)) < 0) {
p->fts_errno = errno;
p->fts_info = FTS_ERR;
} else
Expand Down Expand Up @@ -671,7 +676,7 @@ fts_children(FTS *sp, int instr)
ISSET(FTS_NOCHDIR))
return (sp->fts_child = fts_build(sp, instr));

if ((fd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
if ((fd = _openat(AT_FDCWD, ".", O_RDONLY | O_CLOEXEC, 0)) < 0)
return (NULL);
sp->fts_child = fts_build(sp, instr);
serrno = (sp->fts_child == NULL) ? errno : 0;
Expand Down
Loading