math: Fix some C++ test errors on Solaris 8.

[pspp] / lib / rmdir.c

diff --git a/lib/rmdir.c b/lib/rmdir.c
index 113d13c7143f7c4b35f950eaa0c6e71049038833..36a61180d4b54ecaa692d96e76138614d14f9c36 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-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
@@ -18,24 +18,49 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <unistd.h>
+
 #include <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.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)
 {
+#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 (stat (dir, &statbuf) != 0)
-    return -1;                 /* errno already set */
+    return -1;                  /* errno already set */
 
   if (!S_ISDIR (statbuf.st_mode))
     {
@@ -46,28 +71,29 @@ rmdir (char const *dir)
   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 */
+    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)
-       {
+        {
 
-         /* /bin/rmdir failed.  */
+          /* /bin/rmdir failed.  */
 
-         errno = EIO;
-         return -1;
-       }
+          errno = EIO;
+          return -1;
+        }
       return 0;
     }
+#endif /* !HAVE_RMDIR */
 }