From 9a71af54f53332dda41823763d2ea85a4afdf2e0 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Wed, 22 Nov 2000 01:09:38 +0000 Subject: [PATCH] Fix behavior when removal fails. --- coreutils/rmdir.c | 8 +++++--- rmdir.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index 14ebf92c5..dfe53b215 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c @@ -28,14 +28,16 @@ extern int rmdir_main(int argc, char **argv) { + int status = EXIT_SUCCESS; + if (argc == 1 || **(argv + 1) == '-') usage(rmdir_usage); while (--argc > 0) { if (rmdir(*(++argv)) == -1) { - errorMsg("%s\n", strerror(errno)); - exit(FALSE); + perrorMsg("%s", *argv); + status = EXIT_FAILURE; } } - return(TRUE); + return status; } diff --git a/rmdir.c b/rmdir.c index 14ebf92c5..dfe53b215 100644 --- a/rmdir.c +++ b/rmdir.c @@ -28,14 +28,16 @@ extern int rmdir_main(int argc, char **argv) { + int status = EXIT_SUCCESS; + if (argc == 1 || **(argv + 1) == '-') usage(rmdir_usage); while (--argc > 0) { if (rmdir(*(++argv)) == -1) { - errorMsg("%s\n", strerror(errno)); - exit(FALSE); + perrorMsg("%s", *argv); + status = EXIT_FAILURE; } } - return(TRUE); + return status; }