Applied patch from Vladimir Oleynik via Magnus Damm that removes newlines from

[oweals/busybox.git] / rmdir.c

diff --git a/rmdir.c b/rmdir.c
index 666e0476a5cb18eab10868f8fdfa0b2b1f06d858..2c280376f84cdd02e70b28f898b3158856c70f38 100644 (file)
--- a/rmdir.c
+++ b/rmdir.c
@@ -1,7 +1,10 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini rmdir implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * 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
@@ -19,22 +22,24 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <errno.h>
-
+#include <unistd.h>
+#include <stdlib.h>
+#include "busybox.h"
 
 extern int rmdir_main(int argc, char **argv)
 {
-    if ( argc==1 || **(argv+1) == '-' ) {
-       usage( "rmdir [OPTION]... DIRECTORY...\nRemove the DIRECTORY(ies), if they are empty.");
-    }
+       int status = EXIT_SUCCESS;
+
+       if (argc == 1 || **(argv + 1) == '-')
+               show_usage();
 
-    while (--argc > 0) {
-       if ( rmdir(*(++argv)) == -1 ) {
-           fprintf(stderr, "%s: %s\n", *argv, strerror(errno));
-           exit(FALSE);
+       while (--argc > 0) {
+               if (rmdir(*(++argv)) == -1) {
+                       perror_msg("%s", *argv);
+                       status = EXIT_FAILURE;
+               }
        }
-    }
-    exit(TRUE);
+       return status;
 }