-/* mkdir.c -- BSD compatible make directory function for System V
- Copyright (C) 1988, 1990 Free Software Foundation, Inc.
+/* BSD compatible make directory function for System V
+ Copyright (C) 1988, 1990, 1998 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
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
#endif
#include <sys/types.h>
extern int errno;
#endif
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
#endif
#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# 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. */
subroutine didn't return EEXIST. It does now. */
int
-mkdir (dpath, dmode)
- 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)
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);
while (wait (&status) != cpid)
/* Do nothing. */ ;
- if (status & 0xFFFF)
+ if (status)
{
/* /bin/mkdir failed. */
errno = EIO;