typo fix in a comment in a testcase. oh well...

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

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 56b8387366ce009af6028c8246d67dd520c371d9..2450a43a3fe60cdbab2c1276fe216e2bfbae56b0 100644 (file)
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -1,42 +1,70 @@
+/* vi: set sw=4 ts=4: */
 /*
- * Mini rmdir implementation for busybox
+ * rmdir implementation for busybox
  *
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Copyright (C) 1999 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <errno.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
+
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
 
 
-extern int rmdir_main(int argc, char **argv)
+#define PARENTS 0x01
+#define IGNORE_NON_EMPTY 0x02
+
+int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rmdir_main(int argc UNUSED_PARAM, 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;
+       char *path;
+
+#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
+       static const char rmdir_longopts[] ALIGN1 =
+               "parents\0"                  No_argument "p"
+               /* Debian etch: many packages fail to be purged or installed
+                * because they desperately want this option: */
+               "ignore-fail-on-non-empty\0" No_argument "\xff"
+               ;
+       applet_long_options = rmdir_longopts;
+#endif
+       flags = getopt32(argv, "p");
+       argv += optind;
+
+       if (!*argv) {
+               bb_show_usage();
        }
-    }
-    exit(TRUE);
+
+       do {
+               path = *argv;
+
+               while (1) {
+                       if (rmdir(path) < 0) {
+#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
+                               if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)
+                                       break;
+#endif
+                               bb_perror_msg("'%s'", path);    /* Match gnu rmdir msg. */
+                               status = EXIT_FAILURE;
+                       } else if (flags & PARENTS) {
+                               /* Note: path was not "" since rmdir succeeded. */
+                               path = dirname(path);
+                               /* Path is now just the parent component.  Dirname
+                                * returns "." if there are no parents.
+                                */
+                               if (NOT_LONE_CHAR(path, '.')) {
+                                       continue;
+                               }
+                       }
+                       break;
+               }
+       } while (*++argv);
+
+       return status;
 }