X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmkdir.c;h=efde52e055abb31396d596a310b94b621af85226;hb=6aae241f16ed2dbe57475cb4c8b3a5b1ca1e9699;hp=3726cbbcc1a7a94ca401502c50f2012226064ae7;hpb=880bff095c4a832c6ca0e899485da94a2fa34758;p=gnulib.git

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 3726cbbcc..efde52e05 100644
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -16,19 +16,11 @@
    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).  */
 #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;
@@ -42,8 +34,6 @@ extern int errno;
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
-#include "safe-stat.h"
-
 /* mkdir adapted from GNU tar.  */
 
 /* Make directory DPATH, with permission mode DMODE.
@@ -65,9 +55,9 @@ mkdir (dpath, dmode)
   int cpid, status;
   struct stat statbuf;
 
-  if (SAFE_STAT (dpath, &statbuf) == 0)
+  if (stat (dpath, &statbuf) == 0)
     {
-      errno = EEXIST;		/* stat worked, it already exists */
+      errno = EEXIST;		/* stat worked, so it already exists.  */
       return -1;
     }
 
@@ -78,33 +68,27 @@ mkdir (dpath, dmode)
   cpid = fork ();
   switch (cpid)
     {
-    case -1:			/* cannot fork */
-      return -1;		/* errno already set */
-
-    case 0:			/* child process */
+    case -1:			/* Cannot fork.  */
+      return -1;		/* errno is already set.  */
 
+    case 0:			/* Child process.  */
       /* Cheap hack to set mode of new directory.  Since this child
-	 process is going away anyway, we zap its umask.  This won't
-	 suffice to set SUID, SGID, etc. on this directory, so the parent
-	 process calls chmod afterward.  */
-
-      status = umask (0);
-      umask (status | (0777 & ~dmode));
+	 process is going away anyway, we zap its umask.
+	 This won't suffice to set SUID, SGID, etc. on this
+	 directory, so the parent process calls chmod afterward.  */
+      status = umask (0);	/* Get current umask.  */
+      umask (status | (0777 & ~dmode));	/* Set for mkdir.  */
       execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
       _exit (1);
 
-    default:			/* parent process */
-
+    default:			/* Parent process.  */
       /* Wait for kid to finish.  */
-
       while (wait (&status) != cpid)
 	/* Do nothing.  */ ;
 
       if (status & 0xFFFF)
 	{
-
 	  /* /bin/mkdir failed.  */
-
 	  errno = EIO;
 	  return -1;
 	}