Mercurial > gnulib
annotate lib/closedir.c @ 17363:5a51fb7777a9
sys_select, sys_time: port 2013-01-30 Solaris 2.6 fix to Cygwin
Problem reported by Marco Atzeri in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00000.html>.
* lib/sys_select.in.h [HAVE_SYS_SELECT_H && _CYGWIN_SYS_TIME_H]:
Simply delegate to the system <sys/select.h> in this case too.
Also, pay attention to _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H only
if OSF/1, since otherwise Cygwin breaks, and it doesn't seem to
be needed on Solaris either.
* lib/sys_time.in.h [_CYGWIN_SYS_TIME_H]:
Simply delgate to the system <sys/time.h> in this case.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 19 Mar 2013 09:08:47 -0700 |
parents | e542fd46ad6f |
children | 344018b6e5d7 |
rev | line source |
---|---|
15610
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1 /* Stop reading the entries of a directory. |
17249
e542fd46ad6f
maint: update all copyright year number ranges
Eric Blake <eblake@redhat.com>
parents:
16201
diff
changeset
|
2 Copyright (C) 2006-2013 Free Software Foundation, Inc. |
15610
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
3 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4 This program is free software: you can redistribute it and/or modify |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5 it under the terms of the GNU General Public License as published by |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6 the Free Software Foundation; either version 3 of the License, or |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7 (at your option) any later version. |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
8 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
9 This program is distributed in the hope that it will be useful, |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
10 but WITHOUT ANY WARRANTY; without even the implied warranty of |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
12 GNU General Public License for more details. |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
13 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
14 You should have received a copy of the GNU General Public License |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
15 along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
16 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
17 #include <config.h> |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
18 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
19 /* Specification. */ |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
20 #include <dirent.h> |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
21 |
16024
1529bb1a37a5
closedir: Avoid warning on mingw.
Bruno Haible <bruno@clisp.org>
parents:
15610
diff
changeset
|
22 #if REPLACE_FCHDIR |
1529bb1a37a5
closedir: Avoid warning on mingw.
Bruno Haible <bruno@clisp.org>
parents:
15610
diff
changeset
|
23 # include <unistd.h> |
1529bb1a37a5
closedir: Avoid warning on mingw.
Bruno Haible <bruno@clisp.org>
parents:
15610
diff
changeset
|
24 #endif |
1529bb1a37a5
closedir: Avoid warning on mingw.
Bruno Haible <bruno@clisp.org>
parents:
15610
diff
changeset
|
25 |
15610
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
26 #if HAVE_CLOSEDIR |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
27 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
28 /* Override closedir(), to keep track of the open file descriptors. |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
29 Needed because there is a function dirfd(). */ |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
30 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
31 #else |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
32 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
33 # include <stdlib.h> |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
34 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
35 # include "dirent-private.h" |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
36 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
37 #endif |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
38 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
39 int |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
40 closedir (DIR *dirp) |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
41 { |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
42 # if REPLACE_FCHDIR |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
43 int fd = dirfd (dirp); |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
44 # endif |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
45 int retval; |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
46 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
47 #if HAVE_CLOSEDIR |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
48 # undef closedir |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
49 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
50 retval = closedir (dirp); |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
51 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
52 #else |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
53 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
54 if (dirp->current != INVALID_HANDLE_VALUE) |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
55 FindClose (dirp->current); |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
56 free (dirp); |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
57 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
58 retval = 0; |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
59 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
60 #endif |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
61 |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
62 #if REPLACE_FCHDIR |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
63 if (retval >= 0) |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
64 _gl_unregister_fd (fd); |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
65 #endif |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
66 return retval; |
de2ecfd7fc4a
New modules 'opendir', 'readdir', 'rewinddir', 'closedir'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
67 } |