aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-04 21:11:41 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-04 21:11:41 +0000
commit9378784537d0a4cd4e630aa360d0ae838dfcf500 (patch)
treee1607d2c9565d13cc916214f1c4c9a603a0202d3 /io
parent1c15327821aee947476284374a96c7ebb64dc0d6 (diff)
downloadglibc-9378784537d0a4cd4e630aa360d0ae838dfcf500.tar
glibc-9378784537d0a4cd4e630aa360d0ae838dfcf500.tar.gz
glibc-9378784537d0a4cd4e630aa360d0ae838dfcf500.tar.bz2
glibc-9378784537d0a4cd4e630aa360d0ae838dfcf500.zip
Update.
2003-11-04 Jakub Jelinek <jakub@redhat.com> * io/ftw.c (ftw_dir): Close dir if callback with FTW_D type returns non-zero. * io/Makefile (tests): Add bug-ftw4. * io/bug-ftw4.c: New test.
Diffstat (limited to 'io')
-rw-r--r--io/Makefile2
-rw-r--r--io/bug-ftw4.c124
-rw-r--r--io/ftw.c22
3 files changed, 138 insertions, 10 deletions
diff --git a/io/Makefile b/io/Makefile
index 14358ec93f..906d1e3301 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -57,7 +57,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 bug-ftw3 tst-statvfs
+ tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4 tst-statvfs
distribute := ftwtest-sh
diff --git a/io/bug-ftw4.c b/io/bug-ftw4.c
new file mode 100644
index 0000000000..0a652d3531
--- /dev/null
+++ b/io/bug-ftw4.c
@@ -0,0 +1,124 @@
+/* Test if ftw function doesn't leak fds.
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <fcntl.h>
+#include <ftw.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+static int cb_called;
+
+static int
+cb (const char *name, const struct stat64 *st, int type)
+{
+ return cb_called++ & 1;
+}
+
+int
+main (void)
+{
+ char name[32] = "/tmp/ftwXXXXXX", *p;
+ int ret, i, result = 0, fd, fd1, fd2;
+
+ if (mkdtemp (name) == NULL)
+ {
+ printf ("Couldn't make temporary directory: %m\n");
+ exit (EXIT_FAILURE);
+ }
+ p = strchr (name, '\0');
+ strcpy (p, "/1");
+ if (mkdir (name, 0755) < 0)
+ {
+ printf ("Couldn't make temporary subdirectory: %m\n");
+ exit (EXIT_FAILURE);
+ }
+ *p = '\0';
+
+ ret = ftw64 (name, cb, 20);
+ if (ret != 1)
+ {
+ printf ("ftw64 returned %d instead of 1", ret);
+ result = 1;
+ }
+
+ fd = open (name, O_RDONLY);
+ if (fd < 0)
+ {
+ printf ("open failed: %m\n");
+ result = 1;
+ }
+ fd1 = open (name, O_RDONLY);
+ if (fd1 < 0)
+ {
+ printf ("open failed: %m\n");
+ result = 1;
+ }
+ else
+ close (fd1);
+ if (fd >= 0)
+ close (fd);
+
+ for (i = 0; i < 128; ++i)
+ {
+ ret = ftw64 (name, cb, 20);
+ if (ret != 1)
+ {
+ printf ("ftw64 returned %d instead of 1", ret);
+ result = 1;
+ }
+ }
+
+ fd = open (name, O_RDONLY);
+ if (fd < 0)
+ {
+ printf ("open failed: %m\n");
+ result = 1;
+ }
+ fd2 = open (name, O_RDONLY);
+ if (fd2 < 0)
+ {
+ printf ("open failed: %m\n");
+ result = 1;
+ }
+ else
+ close (fd2);
+ if (fd >= 0)
+ close (fd);
+
+ if (fd2 >= fd1 + 128)
+ {
+ printf ("ftw64 leaking fds: %d -> %d\n", fd1, fd2);
+ result = 1;
+ }
+
+ if (cb_called != 129 * 2)
+ {
+ printf ("callback called %d times\n", cb_called);
+ result = 1;
+ }
+
+ strcpy (p, "/1");
+ rmdir (name);
+ *p = '\0';
+ rmdir (name);
+ return result;
+}
diff --git a/io/ftw.c b/io/ftw.c
index c7c2038c06..6d5cedf63e 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -476,23 +476,27 @@ ftw_dir (struct ftw_data *data, struct STAT *st)
{
result = (*data->func) (data->dirbuf, st, FTW_D, &data->ftw);
if (result != 0)
- return result;
- }
-
- /* If necessary, change to this directory. */
- if (data->flags & FTW_CHDIR)
- {
- if (__fchdir (dirfd (dir.stream)) < 0)
{
- int save_err = errno;
+ int save_err;
+fail:
+ save_err = errno;
__closedir (dir.stream);
__set_errno (save_err);
if (data->actdir-- == 0)
data->actdir = data->maxdir - 1;
data->dirstreams[data->actdir] = NULL;
+ return result;
+ }
+ }
- return -1;
+ /* If necessary, change to this directory. */
+ if (data->flags & FTW_CHDIR)
+ {
+ if (__fchdir (dirfd (dir.stream)) < 0)
+ {
+ result = -1;
+ goto fail;
}
}