X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmkdir.c;h=c921ecfdb4bf627a32c2d75a47d2acac1666b306;hb=22403b089802680b3146c51d85815040fc4e9d46;hp=772c686762f5c9903707ef64e67d77457280246c;hpb=cf42d3e5e80be6bf7093a3ca9be0d04033eaf527;p=gnulib.git

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 772c68676..c921ecfdb 100644
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -1,5 +1,7 @@
-/* BSD compatible make directory function for System V
-   Copyright (C) 1988, 1990, 1998 Free Software Foundation, Inc.
+/* On some systems, mkdir ("foo/", 0700) fails because of the trailing
+   slash.  On those systems, this wrapper removes the trailing slash.
+
+   Copyright (C) 2001, 2003 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
@@ -13,83 +15,51 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+/* Disable the definition of mkdir to rpl_mkdir (from config.h) in this
+   file.  Otherwise, we'd get conflicting prototypes for rpl_mkdir on
+   most systems.  */
+#undef mkdir
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
-
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-/* mkdir adapted from GNU tar.  */
+#include "dirname.h"
+#include "xalloc.h"
 
-/* Make directory DPATH, with permission mode DMODE.
-
-   Written by Robert Rother, Mariah Corporation, August 1985
-   (sdcsvax!rmr or rmr@uscd).  If you want it, it's yours.
-
-   Severely hacked over by John Gilmore to make a 4.2BSD compatible
-   subroutine.	11Mar86; hoptoad!gnu
-
-   Modified by rmtodd@uokmax 6-28-87 -- when making an already existing dir,
-   subroutine didn't return EEXIST.  It does now.  */
+/* This function is required at least for NetBSD 1.5.2.  */
 
 int
-mkdir (const char *dpath, int dmode)
+rpl_mkdir (char const *dir, mode_t mode)
 {
-  int cpid, status;
-  struct stat statbuf;
+  int ret_val;
+  char *tmp_dir;
+  size_t len = strlen (dir);
 
-  if (stat (dpath, &statbuf) == 0)
+  if (len && dir[len - 1] == '/')
     {
-      errno = EEXIST;		/* stat worked, so it already exists.  */
-      return -1;
+      tmp_dir = xstrdup (dir);
+      strip_trailing_slashes (tmp_dir);
     }
-
-  /* If stat fails for a reason other than non-existence, return error.  */
-  if (errno != ENOENT)
-    return -1;
-
-  cpid = fork ();
-  switch (cpid)
+  else
     {
-    case -1:			/* Cannot fork.  */
-      return -1;		/* errno is already set.  */
+      tmp_dir = (char *) dir;
+    }
 
-    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);	/* Get current umask.  */
-      umask (status | (0777 & ~dmode));	/* Set for mkdir.  */
-      execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
-      _exit (1);
+  ret_val = mkdir (tmp_dir, mode);
 
-    default:			/* Parent process.  */
-      /* Wait for kid to finish.  */
-      while (wait (&status) != cpid)
-	/* Do nothing.  */ ;
+  if (tmp_dir != dir)
+    free (tmp_dir);
 
-      if (status & 0xFFFF)
-	{
-	  /* /bin/mkdir failed.  */
-	  errno = EIO;
-	  return -1;
-	}
-      return chmod (dpath, dmode);
-    }
+  return ret_val;
 }