Mercurial > gnulib
annotate lib/opendir-safer.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 |
|---|---|
| 11936 | 1 /* Invoke opendir, but avoid some glitches. |
| 2 | |
|
17249
e542fd46ad6f
maint: update all copyright year number ranges
Eric Blake <eblake@redhat.com>
parents:
16201
diff
changeset
|
3 Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 11936 | 4 |
| 5 This program is free software: you can redistribute it and/or modify | |
| 6 it under the terms of the GNU General Public License as published by | |
| 7 the Free Software Foundation; either version 3 of the License, or | |
| 8 (at your option) any later version. | |
| 9 | |
| 10 This program is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 GNU General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with this program. If not, see <http://www.gnu.org/licenses/>. */ | |
| 17 | |
| 18 /* Written by Eric Blake. */ | |
| 19 | |
| 20 #include <config.h> | |
| 21 | |
| 22 #include "dirent-safer.h" | |
| 23 | |
| 24 #include <errno.h> | |
| 25 #include <unistd.h> | |
| 26 #include "unistd-safer.h" | |
| 27 | |
| 28 /* Like opendir, but do not clobber stdin, stdout, or stderr. */ | |
| 29 | |
| 30 DIR * | |
| 31 opendir_safer (char const *name) | |
| 32 { | |
| 33 DIR *dp = opendir (name); | |
| 34 | |
| 35 if (dp) | |
| 36 { | |
| 37 int fd = dirfd (dp); | |
| 38 | |
| 39 if (0 <= fd && fd <= STDERR_FILENO) | |
| 40 { | |
| 41 /* If fdopendir is native (as on Linux), then it is safe to | |
| 42 assume dirfd(fdopendir(n))==n. If we are using the | |
| 43 gnulib module fdopendir, then this guarantee is not met, | |
| 44 but fdopendir recursively calls opendir_safer up to 3 | |
| 45 times to at least get a safe fd. If fdopendir is not | |
| 46 present but dirfd is accurate (as on cygwin 1.5.x), then | |
| 47 we recurse up to 3 times ourselves. Finally, if dirfd | |
| 48 always fails (as on mingw), then we are already safe. */ | |
| 49 DIR *newdp; | |
| 50 int e; | |
| 51 #if HAVE_FDOPENDIR || GNULIB_FDOPENDIR | |
| 52 int f = dup_safer (fd); | |
|
14810
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
53 if (f < 0) |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
54 { |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
55 e = errno; |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
56 newdp = NULL; |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
57 } |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
58 else |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
59 { |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
60 newdp = fdopendir (f); |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
61 e = errno; |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
62 if (! newdp) |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
63 close (f); |
|
fdcc880c0998
opendir-safer.c: don't clobber errno; don't close negative FD
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
64 } |
| 11936 | 65 #else /* !FDOPENDIR */ |
| 66 newdp = opendir_safer (name); | |
| 67 e = errno; | |
| 68 #endif | |
| 69 closedir (dp); | |
| 70 errno = e; | |
| 71 dp = newdp; | |
| 72 } | |
| 73 } | |
| 74 | |
| 75 return dp; | |
| 76 } |