aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
Diffstat (limited to 'io')
-rw-r--r--io/Makefile2
-rw-r--r--io/bug-ftw3.c46
-rw-r--r--io/ftw.c3
3 files changed, 50 insertions, 1 deletions
diff --git a/io/Makefile b/io/Makefile
index b96421b..0c39fa8 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -56,7 +56,7 @@ static-only-routines = stat fstat lstat mknod stat64 fstat64 lstat64
others := pwd
test-srcs := ftwtest
tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \
- tst-fcntl bug-ftw1 bug-ftw2
+ tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3
distribute := ftwtest-sh
diff --git a/io/bug-ftw3.c b/io/bug-ftw3.c
new file mode 100644
index 0000000..98bb563
--- /dev/null
+++ b/io/bug-ftw3.c
@@ -0,0 +1,46 @@
+#include <errno.h>
+#include <ftw.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static int
+cb (const char *fname, const struct stat *st, int flag)
+{
+ printf ("%s %d\n", fname, flag);
+ return 0;
+}
+
+int
+main (void)
+{
+ char tmp[] = "/tmp/ftwXXXXXX";
+ char *dname;
+ int r;
+ int e;
+
+ dname = mkdtemp (tmp);
+ if (dname == NULL)
+ {
+ printf ("mkdtemp: %m\n");
+ exit (1);
+ }
+
+ if (chmod (dname, S_IWUSR|S_IXUSR|S_IWGRP|S_IXGRP|S_IWOTH|S_IXOTH) != 0)
+ {
+ printf ("chmod: %m\n");
+ exit (1);
+ }
+
+ r = ftw (dname, cb, 10);
+ e = errno;
+ printf ("r = %d", r);
+ if (r != 0)
+ printf (", errno = %d", errno);
+ puts ("");
+
+ chmod (dname, S_IRWXU|S_IRWXG|S_IRWXO);
+ rmdir (dname);
+
+ return r != -1 && e == EACCES;
+}
diff --git a/io/ftw.c b/io/ftw.c
index 862774c..cbd6be7 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -473,6 +473,9 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
return -1;
}
+ if (__access (dir, R_OK) != 0)
+ return -1;
+
data.maxdir = descriptors < 1 ? 1 : descriptors;
data.actdir = 0;
data.dirstreams = (struct dir_data **) alloca (data.maxdir