GNU file utilities

[gnulib.git] / lib / mkdir.c

diff --git a/lib/mkdir.c b/lib/mkdir.c
index a5f6230..1a5ba2d 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -1,4 +1,4 @@
-/* mkrmdir.c -- BSD compatible directory functions for System V
+/* mkdir.c -- BSD compatible make directory function for System V
    Copyright (C) 1988, 1990 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,34 +16,27 @@
    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 will use ./config.h rather than /config.h
-   (which it would do because it found this file in ).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#ifndef STDC_HEADERS
+#ifndef errno
 extern int errno;
 #endif
 
-#ifdef STAT_MACROS_BROKEN
-#ifdef S_ISDIR
+#ifdef STAT_MACROS_BROKEN
 #undef S_ISDIR
 #endif
-#endif /* STAT_MACROS_BROKEN.  */
 
 #if !defined(S_ISDIR) && defined(S_IFDIR)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
-/* mkdir and rmdir adapted from GNU tar.  */
+#include "safe-stat.h"
+
+/* mkdir adapted from GNU tar.  */
 
 /* Make directory DPATH, with permission mode DMODE.
 
@@ -64,7 +57,7 @@ mkdir (dpath, dmode)
   int cpid, status;
   struct stat statbuf;
 
-  if (stat (dpath, &statbuf) == 0)
+  if (SAFE_STAT (dpath, &statbuf) == 0)
     {
       errno = EEXIST;          /* stat worked, so it already exists.  */
       return -1;
@@ -78,7 +71,7 @@ mkdir (dpath, dmode)
   switch (cpid)
     {
     case -1:                   /* Cannot fork.  */
-      return -1;               /* errno is set already.  */
+      return -1;               /* errno is already set.  */
 
     case 0:                    /* Child process.  */
       /* Cheap hack to set mode of new directory.  Since this child
@@ -91,56 +84,16 @@ mkdir (dpath, dmode)
       _exit (1);
 
     default:                   /* Parent process.  */
-      while (wait (&status) != cpid) /* Wait for kid to finish.  */
+      /* Wait for kid to finish.  */
+      while (wait (&status) != cpid)
        /* Do nothing.  */ ;
 
       if (status & 0xFFFF)
        {
-         errno = EIO;          /* /bin/mkdir failed.  */
+         /* /bin/mkdir failed.  */
+         errno = EIO;
          return -1;
        }
       return chmod (dpath, dmode);
     }
 }
-
-/* Remove directory DPATH.
-   Return 0 if successful, -1 if not.  */
-
-int
-rmdir (dpath)
-     char *dpath;
-{
-  int cpid, status;
-  struct stat statbuf;
-
-  if (stat (dpath, &statbuf) != 0)
-    return -1;                 /* stat set errno.  */
-
-  if (!S_ISDIR (statbuf.st_mode))
-    {
-      errno = ENOTDIR;
-      return -1;
-    }
-
-  cpid = fork ();
-  switch (cpid)
-    {
-    case -1:                   /* Cannot fork.  */
-      return -1;               /* errno is set already.  */
-
-    case 0:                    /* Child process.  */
-      execl ("/bin/rmdir", "rmdir", dpath, (char *) 0);
-      _exit (1);
-
-    default:                   /* Parent process.  */
-      while (wait (&status) != cpid) /* Wait for kid to finish.  */
-       /* Do nothing.  */ ;
-
-      if (status & 0xFFFF)
-       {
-         errno = EIO;          /* /bin/rmdir failed.  */
-         return -1;
-       }
-      return 0;
-    }
-}