[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220123155955.16484-2-ismael@iodev.co.uk>
Date: Sun, 23 Jan 2022 16:59:54 +0100
From: Ismael Luceno <ismael@...ev.co.uk>
To: musl@...ts.openwall.com
Cc: Rich Felker <dalias@...c.org>,
Ismael Luceno <ismael@...ev.co.uk>
Subject: [PATCH v3 1/2] nftw: implement FTW_CHDIR
Signed-off-by: Ismael Luceno <ismael@...ev.co.uk>
---
src/misc/nftw.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/misc/nftw.c b/src/misc/nftw.c
index 5b233b2b8e77..7569a657e54e 100644
--- a/src/misc/nftw.c
+++ b/src/misc/nftw.c
@@ -87,6 +87,14 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
DIR *d = fdopendir(dfd);
if (d) {
struct dirent *de;
+ if (flags & FTW_CHDIR) {
+ if (!fchdir(dfd)) {
+ err = errno;
+ closedir(d);
+ errno = err;
+ return -1;
+ }
+ }
while ((de = readdir(d))) {
if (de->d_name[0] == '.'
&& (!de->d_name[1]
@@ -123,6 +131,7 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
int r, cs;
size_t l;
char pathbuf[PATH_MAX+1];
+ int orig_dfd;
if (fd_limit <= 0) return 0;
@@ -133,9 +142,22 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
}
memcpy(pathbuf, path, l+1);
+ if (flags & FTW_CHDIR) {
+ orig_dfd = open(".", O_CLOEXEC | O_PATH);
+ if (orig_dfd < 0)
+ return -1;
+ }
+
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
r = do_nftw(pathbuf, fn, fd_limit, flags, NULL);
pthread_setcancelstate(cs, 0);
+ if (flags & FTW_CHDIR) {
+ if (!fchdir(orig_dfd))
+ r = -1;
+ int err = errno;
+ close(orig_dfd);
+ errno = err;
+ }
return r;
}
--
2.33.0
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
