Bugfixes

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

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index f9f82bba4e3f30e2b5e4c8f8a6ee99faa916c4c9..a10e5bb4fde014627b30efb0b924288f785ca872 100644 (file)
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -1,10 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini rmdir implementation for busybox
+ * rmdir implementation for busybox
  *
- *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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
@@ -22,22 +20,54 @@
  *
  */
 
+/* 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"
-#include <stdio.h>
-#include <errno.h>
 
 extern int rmdir_main(int argc, char **argv)
 {
        int status = EXIT_SUCCESS;
+       int flags;
+       int do_dot;
+       char *path;
 
-       if (argc == 1 || **(argv + 1) == '-')
-               usage(rmdir_usage);
+       flags = bb_getopt_ulflags(argc, argv, "p");
 
-       while (--argc > 0) {
-               if (rmdir(*(++argv)) == -1) {
-                       perror_msg("%s", *argv);
-                       status = EXIT_FAILURE;
-               }
+       argv += optind;
+
+       if (!*argv) {
+               bb_show_usage();
        }
+
+       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;
 }