Bugfixes

[oweals/busybox.git] / coreutils / rmdir.c

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 666e0476a5cb18eab10868f8fdfa0b2b1f06d858..a10e5bb4fde014627b30efb0b924288f785ca872 100644 (file)
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -1,7 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
- * Mini rmdir implementation for busybox
+ * rmdir implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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 +20,54 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <errno.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <libgen.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.");
-    }
-
-    while (--argc > 0) {
-       if ( rmdir(*(++argv)) == -1 ) {
-           fprintf(stderr, "%s: %s\n", *argv, strerror(errno));
-           exit(FALSE);
+       int status = EXIT_SUCCESS;
+       int flags;
+       int do_dot;
+       char *path;
+
+       flags = bb_getopt_ulflags(argc, argv, "p");
+
+       argv += optind;
+
+       if (!*argv) {
+               bb_show_usage();
        }
-    }
-    exit(TRUE);
+
+       do {
+               path = *argv;
+
+               /* Record if the first char was a '.' so we can use dirname later. */
+               do_dot = (*path == '.');
+
+               do {
+                       if (rmdir(path) < 0) {
+                               bb_perror_msg("`%s'", path);    /* Match gnu rmdir msg. */
+                               status = EXIT_FAILURE;
+                       } else if (flags) {
+                               /* Note: path was not empty or null since rmdir succeeded. */
+                               path = dirname(path);
+                               /* Path is now just the parent component.  Note that dirname
+                                * returns "." if there are no parents.  We must distinguish
+                                * this from the case of the original path starting with '.'.
+                 */
+                               if (do_dot || (*path != '.') || path[1]) {
+                                       continue;
+                               }
+                       }
+                       break;
+               } while (1);
+
+       } while (*++argv);
+
+       return status;
 }