doc: use ASCII in .texi files where UTF-8 isn't needed

[gnulib.git] / lib / rmdir.c

diff --git a/lib/rmdir.c b/lib/rmdir.c
index 113d13c..ec7a586 100644 (file)
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,7 +1,7 @@
-/* BSD compatible remove directory function for System V
+/* Work around rmdir bugs.
 
-   Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 2006 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
@@ -18,56 +18,36 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <unistd.h>
+
 #include <errno.h>
+#include <string.h>
+
+#include "dosname.h"
 
-/* rmdir adapted from GNU tar.  */
+#undef rmdir
 
 /* Remove directory DIR.
    Return 0 if successful, -1 if not.  */
 
 int
-rmdir (char const *dir)
+rpl_rmdir (char const *dir)
 {
-  pid_t cpid;
-  int status;
-  struct stat statbuf;
-
-  if (stat (dir, &statbuf) != 0)
-    return -1;                 /* errno already set */
-
-  if (!S_ISDIR (statbuf.st_mode))
+  /* 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 = ENOTDIR;
+      errno = EINVAL;
       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;
-    }
+  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;
 }