X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frmdir.c;h=ec7a586f70224762866aa43e41041b2fa6cace62;hb=e2811532647e8280f13347d71579621ac441c0cd;hp=1a0698669780cb9c36588b52b3df5c4a3951568c;hpb=b433e6454b40de02a3f208a52a4a3813d26a14e8;p=gnulib.git

diff --git a/lib/rmdir.c b/lib/rmdir.c
index 1a0698669..ec7a586f7 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,7 +1,7 @@
 /* Work around rmdir bugs.
 
-   Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 2006, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2014 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
@@ -22,8 +22,8 @@
 
 #include <errno.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+
+#include "dosname.h"
 
 #undef rmdir
 
@@ -33,7 +33,6 @@
 int
 rpl_rmdir (char const *dir)
 {
-#if HAVE_RMDIR
   /* Work around cygwin 1.5.x bug where rmdir("dir/./") succeeds.  */
   size_t len = strlen (dir);
   int result;
@@ -51,49 +50,4 @@ rpl_rmdir (char const *dir)
   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 (stat (dir, &statbuf) != 0)
-    return -1;			/* errno already set */
-
-  if (!S_ISDIR (statbuf.st_mode))
-    {
-      errno = ENOTDIR;
-      return -1;
-    }
-
-  cpid = fork ();
-  switch (cpid)
-    {
-    case -1:			/* cannot fork */
-      return -1;		/* errno already set */
-
-    case 0:			/* child process */
-      execl ("/bin/rmdir", "rmdir", dir, (char *) 0);
-      _exit (1);
-
-    default:			/* parent process */
-
-      /* Wait for kid to finish.  */
-
-      while (wait (&status) != cpid)
-	/* Do nothing.  */ ;
-
-      if (status)
-	{
-
-	  /* /bin/rmdir failed.  */
-
-	  errno = EIO;
-	  return -1;
-	}
-      return 0;
-    }
-#endif /* !HAVE_RMDIR */
 }