X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frmdir.c;h=113d13c7143f7c4b35f950eaa0c6e71049038833;hb=9fbf8e1a391ab49dca9c608a32af9a42831f3445;hp=73d8e43397bea8f992352ca2e05189e91245fd47;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git
diff --git a/lib/rmdir.c b/lib/rmdir.c
index 73d8e4339..113d13c71 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,11 +1,12 @@
/* BSD compatible remove directory function for System V
- Copyright (C) 1988, 1990, 1999, 2003, 2004 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
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,32 +14,27 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
#include
#include
#include
-#include "stat-macros.h"
-
/* rmdir adapted from GNU tar. */
-/* Remove directory DPATH.
+/* Remove directory DIR.
Return 0 if successful, -1 if not. */
int
-rmdir (char const *dpath)
+rmdir (char const *dir)
{
pid_t cpid;
int status;
struct stat statbuf;
- if (stat (dpath, &statbuf) != 0)
+ if (stat (dir, &statbuf) != 0)
return -1; /* errno already set */
if (!S_ISDIR (statbuf.st_mode))
@@ -54,7 +50,7 @@ rmdir (char const *dpath)
return -1; /* errno already set */
case 0: /* child process */
- execl ("/bin/rmdir", "rmdir", dpath, (char *) 0);
+ execl ("/bin/rmdir", "rmdir", dir, (char *) 0);
_exit (1);
default: /* parent process */