From a1591128948241cc5c96ec5b755a044ef628f9fd Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 6 Apr 2010 23:23:00 +0200 Subject: [PATCH] Assume rmdir exists. --- ChangeLog | 5 +++++ lib/rmdir.c | 48 ------------------------------------------------ 2 files changed, 5 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec9ce1d4a..c8b1d83b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-04-06 Bruno Haible + + Assume rmdir exists. + * lib/rmdir.c (rpl_rmdir): Remove code that invokes the rmdir program. + 2010-04-06 Giuseppe Scrivano doc: update users.txt diff --git a/lib/rmdir.c b/lib/rmdir.c index 36a61180d..76740fdca 100644 --- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -22,8 +22,6 @@ #include #include -#include -#include #undef rmdir @@ -33,7 +31,6 @@ int rpl_rmdir (char const *dir) { -#if HAVE_RMDIR /* Work around cygwin 1.5.x bug where rmdir("dir/./") succeeds. */ size_t len = strlen (dir); int result; @@ -51,49 +48,4 @@ rpl_rmdir (char const *dir) if (result == -1 && errno == EINVAL) errno = ENOTDIR; return result; - -#else /* !HAVE_RMDIR */ - /* rmdir adapted from GNU tar. FIXME: Delete this implementation in - 2010 if no one reports a system with missing rmdir. */ - pid_t cpid; - int status; - struct stat statbuf; - - if (stat (dir, &statbuf) != 0) - return -1; /* errno already set */ - - if (!S_ISDIR (statbuf.st_mode)) - { - errno = ENOTDIR; - return -1; - } - - cpid = fork (); - switch (cpid) - { - case -1: /* cannot fork */ - return -1; /* errno already set */ - - case 0: /* child process */ - execl ("/bin/rmdir", "rmdir", dir, (char *) 0); - _exit (1); - - default: /* parent process */ - - /* Wait for kid to finish. */ - - while (wait (&status) != cpid) - /* Do nothing. */ ; - - if (status) - { - - /* /bin/rmdir failed. */ - - errno = EIO; - return -1; - } - return 0; - } -#endif /* !HAVE_RMDIR */ } -- 2.11.0