X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frmdir.c;h=113d13c7143f7c4b35f950eaa0c6e71049038833;hb=7080851f5a8270aee50e8545d28c48c6c75decc1;hp=f10b3969e67b74c71f67940f102eed3dfea72f21;hpb=760d9074e721bbffc97ca68eb48c06a248727c4e;p=gnulib.git

diff --git a/lib/rmdir.c b/lib/rmdir.c
index f10b3969e..113d13c71 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.
+/* BSD compatible remove directory function for System V
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 2006 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,51 +14,27 @@
    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.  */
-
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
 #include <config.h>
-#else
-#include "config.h"
-#endif
-#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
-
 #include <errno.h>
-#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"
 
 /* rmdir adapted from GNU tar.  */
 
-/* Remove directory DPATH.
+/* Remove directory DIR.
    Return 0 if successful, -1 if not.  */
 
 int
-rmdir (dpath)
-     char *dpath;
+rmdir (char const *dir)
 {
-  int cpid, status;
+  pid_t cpid;
+  int status;
   struct stat statbuf;
 
-  if (SAFE_STAT (dpath, &statbuf) != 0)
+  if (stat (dir, &statbuf) != 0)
     return -1;			/* errno already set */
 
   if (!S_ISDIR (statbuf.st_mode))
@@ -72,7 +50,7 @@ rmdir (dpath)
       return -1;		/* errno already set */
 
     case 0:			/* child process */
-      execl ("/bin/rmdir", "rmdir", dpath, (char *) 0);
+      execl ("/bin/rmdir", "rmdir", dir, (char *) 0);
       _exit (1);
 
     default:			/* parent process */
@@ -82,7 +60,7 @@ rmdir (dpath)
       while (wait (&status) != cpid)
 	/* Do nothing.  */ ;
 
-      if (status & 0xFFFF)
+      if (status)
 	{
 
 	  /* /bin/rmdir failed.  */