Update to changelog -- mostly from Larry Doolittle.

[oweals/busybox.git] / rmdir.c

diff --git a/rmdir.c b/rmdir.c
index 4edb9b6b3988f392bec624c3098acb57ea0edf09..f9f82bba4e3f30e2b5e4c8f8a6ee99faa916c4c9 100644 (file)
--- a/rmdir.c
+++ b/rmdir.c
@@ -22,27 +22,22 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 
-
 extern int rmdir_main(int argc, char **argv)
 {
-       if (argc == 1 || **(argv + 1) == '-') {
-               usage
-                       ("rmdir [OPTION]... DIRECTORY...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-                        "\nRemove the DIRECTORY(ies), if they are empty.\n"
-#endif
-                        );
-       }
+       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);
+                       perror_msg("%s", *argv);
+                       status = EXIT_FAILURE;
                }
        }
-       return(TRUE);
+       return status;
 }