Fixed segfault with 'cut -f 1 -d:' and added 'cut -s' suport.

[oweals/busybox.git] / rmdir.c

diff --git a/rmdir.c b/rmdir.c
index 56b8387366ce009af6028c8246d67dd520c371d9..0751808c047920d503f1a213f57953c16e1ccaa8 100644 (file)
--- a/rmdir.c
+++ b/rmdir.c
@@ -1,8 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini rmdir implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 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
@@ -28,15 +29,20 @@
 
 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.");
-    }
+       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
+                        );
+       }
 
-    while (--argc > 0) {
-       if ( rmdir(*(++argv)) == -1 ) {
-           fprintf(stderr, "%s: %s\n", *argv, strerror(errno));
-           exit(FALSE);
+       while (--argc > 0) {
+               if (rmdir(*(++argv)) == -1) {
+                       fprintf(stderr, "%s: %s\n", *argv, strerror(errno));
+                       exit(FALSE);
+               }
        }
-    }
-    exit(TRUE);
+       return(TRUE);
 }