X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frmdir.c;h=36a61180d4b54ecaa692d96e76138614d14f9c36;hb=f5e328c1b9481fedbe4134404155b1c89d0aeded;hp=23c2873c3d8949836ef29f36cc876025f8a8550e;hpb=2d6883c97bd82ff276eb36d09ec6ec89a923cc5a;p=gnulib.git diff --git a/lib/rmdir.c b/lib/rmdir.c index 23c2873c3..36a61180d 100644 --- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -1,10 +1,12 @@ -/* rmdir.c -- BSD compatible remove directory function for System V - Copyright (C) 1988, 1990 Free Software Foundation, Inc. +/* Work around rmdir bugs. - This program is free software; you can redistribute it and/or modify + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2010 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,45 +14,53 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif -#include -#include +#include #include -#ifndef errno -extern int errno; -#endif - -#ifdef STAT_MACROS_BROKEN -#undef S_ISDIR -#endif - -#if !defined(S_ISDIR) && defined(S_IFDIR) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) -#endif - -#include "safe-stat.h" +#include +#include +#include -/* rmdir adapted from GNU tar. */ +#undef rmdir -/* Remove directory DPATH. +/* Remove directory DIR. Return 0 if successful, -1 if not. */ int -rmdir (dpath) - char *dpath; +rpl_rmdir (char const *dir) { - int cpid, status; +#if HAVE_RMDIR + /* Work around cygwin 1.5.x bug where rmdir("dir/./") succeeds. */ + size_t len = strlen (dir); + int result; + while (len && ISSLASH (dir[len - 1])) + len--; + if (len && dir[len - 1] == '.' && (1 == len || ISSLASH (dir[len - 2]))) + { + errno = EINVAL; + return -1; + } + result = rmdir (dir); + /* Work around mingw bug, where rmdir("file/") fails with EINVAL + instead of ENOTDIR. We've already filtered out trailing ., the + only reason allowed by POSIX for EINVAL. */ + if (result == -1 && errno == EINVAL) + errno = ENOTDIR; + return result; + +#else /* !HAVE_RMDIR */ + /* rmdir adapted from GNU tar. FIXME: Delete this implementation in + 2010 if no one reports a system with missing rmdir. */ + pid_t cpid; + int status; struct stat statbuf; - if (safe_stat (dpath, &statbuf) != 0) - return -1; /* errno already set */ + if (stat (dir, &statbuf) != 0) + return -1; /* errno already set */ if (!S_ISDIR (statbuf.st_mode)) { @@ -61,28 +71,29 @@ rmdir (dpath) cpid = fork (); switch (cpid) { - case -1: /* cannot fork */ - return -1; /* errno already set */ + case -1: /* cannot fork */ + return -1; /* errno already set */ - case 0: /* child process */ - execl ("/bin/rmdir", "rmdir", dpath, (char *) 0); + case 0: /* child process */ + execl ("/bin/rmdir", "rmdir", dir, (char *) 0); _exit (1); - default: /* parent process */ + default: /* parent process */ /* Wait for kid to finish. */ while (wait (&status) != cpid) - /* Do nothing. */ ; + /* Do nothing. */ ; - if (status & 0xFFFF) - { + if (status) + { - /* /bin/rmdir failed. */ + /* /bin/rmdir failed. */ - errno = EIO; - return -1; - } + errno = EIO; + return -1; + } return 0; } +#endif /* !HAVE_RMDIR */ }