(__strtol): Remove decl; it doesn't work if __strtol

[gnulib.git] / lib / mkdir.c

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 772c686..1829a9e 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -34,6 +34,16 @@ extern int errno;
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_IRWXU
+# define S_IRWXU 0700
+#endif
+#ifndef S_IRWXG
+# define S_IRWXG 0070
+#endif
+#ifndef S_IRWXO
+# define S_IRWXO 0007
+#endif
+
 /* mkdir adapted from GNU tar.  */
 
 /* Make directory DPATH, with permission mode DMODE.
@@ -48,9 +58,11 @@ extern int errno;
    subroutine didn't return EEXIST.  It does now.  */
 
 int
-mkdir (const char *dpath, int dmode)
+mkdir (const char *dpath, mode_t dmode)
 {
-  int cpid, status;
+  pid_t cpid;
+  mode_t mode;
+  int status;
   struct stat statbuf;
 
   if (stat (dpath, &statbuf) == 0)
@@ -74,8 +86,9 @@ mkdir (const char *dpath, int 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.  */
+      mode = umask (0);        /* Get current umask.  */
+      /* Set for mkdir.  */
+      umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode));
       execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
       _exit (1);
 
@@ -84,7 +97,7 @@ mkdir (const char *dpath, int dmode)
       while (wait (&status) != cpid)
        /* Do nothing.  */ ;
 
-      if (status & 0xFFFF)
+      if (status)
        {
          /* /bin/mkdir failed.  */
          errno = EIO;