-/* mkdir.c -- BSD compatible directory functions 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
GNU General Public License for more details.
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., 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
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
#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
-#undef S_ISDIR
+#if 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)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
-#include "safe-stat.h"
-
-/* mkdir and rmdir adapted from GNU tar. */
+/* mkdir adapted from GNU tar. */
/* Make directory DPATH, with permission mode DMODE.
subroutine didn't return EEXIST. It does now. */
int
-mkdir (dpath, dmode)
- char *dpath;
- int dmode;
+mkdir (const char *dpath, int dmode)
{
int cpid, status;
struct stat statbuf;
- if (SAFE_STAT (dpath, &statbuf) == 0)
+ if (stat (dpath, &statbuf) == 0)
{
errno = EEXIST; /* stat worked, so it already exists. */
return -1;
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
_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 (SAFE_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;
- }
-}