Mercurial > gnulib
annotate lib/rmdir.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 |
---|---|
11993
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
1 /* Work around rmdir bugs. |
4665 | 2 |
17249
e542fd46ad6f
maint: update all copyright year number ranges
Eric Blake <eblake@redhat.com>
parents:
16201
diff
changeset
|
3 Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2013 Free Software |
12559
c2cbabec01dd
update nearly all FSF copyright year lists to include 2010
Jim Meyering <meyering@redhat.com>
parents:
12518
diff
changeset
|
4 Foundation, Inc. |
315 | 5 |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7581
diff
changeset
|
6 This program is free software: you can redistribute it and/or modify |
315 | 7 it under the terms of the GNU General Public License as published by |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7581
diff
changeset
|
8 the Free Software Foundation; either version 3 of the License, or |
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7581
diff
changeset
|
9 (at your option) any later version. |
315 | 10 |
11 This program is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7581
diff
changeset
|
17 along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
315 | 18 |
7302
8a1a9361108c
* _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents:
6259
diff
changeset
|
19 #include <config.h> |
315 | 20 |
11993
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
21 #include <unistd.h> |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
22 |
315 | 23 #include <errno.h> |
11993
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
24 #include <string.h> |
315 | 25 |
14393
9f47f8c334f2
dirname: move m4/dos.m4 functionality into lib/dosname.h
Paul Eggert <eggert@cs.ucla.edu>
parents:
14079
diff
changeset
|
26 #include "dosname.h" |
9f47f8c334f2
dirname: move m4/dos.m4 functionality into lib/dosname.h
Paul Eggert <eggert@cs.ucla.edu>
parents:
14079
diff
changeset
|
27 |
11993
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
28 #undef rmdir |
315 | 29 |
5907 | 30 /* Remove directory DIR. |
315 | 31 Return 0 if successful, -1 if not. */ |
32 | |
33 int | |
11993
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
34 rpl_rmdir (char const *dir) |
315 | 35 { |
11993
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
36 /* Work around cygwin 1.5.x bug where rmdir("dir/./") succeeds. */ |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
37 size_t len = strlen (dir); |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
38 int result; |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
39 while (len && ISSLASH (dir[len - 1])) |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
40 len--; |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
41 if (len && dir[len - 1] == '.' && (1 == len || ISSLASH (dir[len - 2]))) |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
42 { |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
43 errno = EINVAL; |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
44 return -1; |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
45 } |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
46 result = rmdir (dir); |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
47 /* Work around mingw bug, where rmdir("file/") fails with EINVAL |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
48 instead of ENOTDIR. We've already filtered out trailing ., the |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
49 only reason allowed by POSIX for EINVAL. */ |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
50 if (result == -1 && errno == EINVAL) |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
51 errno = ENOTDIR; |
767d867147de
rmdir: work around cygwin 1.5.x and mingw bugs
Eric Blake <ebb9@byu.net>
parents:
9309
diff
changeset
|
52 return result; |
315 | 53 } |