1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
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.
--- libc/io/Makefile.jj 2003-10-29 00:18:42.000000000 +0100
+++ libc/io/Makefile 2003-11-04 19:40:10.000000000 +0100
@@ -57,7 +57,7 @@ static-only-routines = stat fstat lstat
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-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4
distribute := ftwtest-sh
--- libc/io/ftw.c.jj 2003-06-11 23:48:58.000000000 +0200
+++ libc/io/ftw.c 2003-11-04 19:57:42.000000000 +0100
@@ -474,7 +474,19 @@ ftw_dir (struct ftw_data *data, struct S
{
result = (*data->func) (data->dirbuf, st, FTW_D, &data->ftw);
if (result != 0)
- return result;
+ {
+ 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;
+ }
}
/* If necessary, change to this directory. */
@@ -492,17 +504,7 @@ ftw_dir (struct ftw_data *data, struct S
}
if (result != 0)
- {
- int 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;
- }
+ goto fail;
}
/* Next, update the `struct FTW' information. */
--- libc/io/bug-ftw4.c.jj 2003-11-04 19:39:53.000000000 +0100
+++ libc/io/bug-ftw4.c 2003-11-04 19:43:57.000000000 +0100
@@ -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;
+}
|
GitWeb