projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
rmdir.c
diff --git
a/lib/rmdir.c
b/lib/rmdir.c
index
58b2edb
..
1221f4f
100644
(file)
--- a/
lib/rmdir.c
+++ b/
lib/rmdir.c
@@
-1,5
+1,7
@@
/* BSD compatible remove directory function for System V
/* BSD compatible remove directory function for System V
- Copyright (C) 1988, 1990 Free Software Foundation, Inc.
+
+ Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 2006 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
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,41
+15,27
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
-
#include <errno.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
/* rmdir adapted from GNU tar. */
/* rmdir adapted from GNU tar. */
-/* Remove directory D
PATH
.
+/* Remove directory D
IR
.
Return 0 if successful, -1 if not. */
int
Return 0 if successful, -1 if not. */
int
-rmdir (dpath)
- char *dpath;
+rmdir (char const *dir)
{
{
- int cpid, status;
+ pid_t cpid;
+ int status;
struct stat statbuf;
struct stat statbuf;
- if (stat (d
path
, &statbuf) != 0)
+ if (stat (d
ir
, &statbuf) != 0)
return -1; /* errno already set */
if (!S_ISDIR (statbuf.st_mode))
return -1; /* errno already set */
if (!S_ISDIR (statbuf.st_mode))
@@
-63,7
+51,7
@@
rmdir (dpath)
return -1; /* errno already set */
case 0: /* child process */
return -1; /* errno already set */
case 0: /* child process */
- execl ("/bin/rmdir", "rmdir", d
path
, (char *) 0);
+ execl ("/bin/rmdir", "rmdir", d
ir
, (char *) 0);
_exit (1);
default: /* parent process */
_exit (1);
default: /* parent process */
@@
-73,7
+61,7
@@
rmdir (dpath)
while (wait (&status) != cpid)
/* Do nothing. */ ;
while (wait (&status) != cpid)
/* Do nothing. */ ;
- if (status
& 0xFFFF
)
+ if (status)
{
/* /bin/rmdir failed. */
{
/* /bin/rmdir failed. */