Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / rmdir.c

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 83b27c9..cc2dea0 100644 (file)
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -1,96 +1,87 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini rmdir implementation for busybox
+ * rmdir implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <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
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <getopt.h>
-#include <unistd.h>
-#include <stdlib.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
-#include "busybox.h"
+//usage:#define rmdir_trivial_usage
+//usage:       "[OPTIONS] DIRECTORY..."
+//usage:#define rmdir_full_usage "\n\n"
+//usage:       "Remove DIRECTORY if it is empty\n"
+//usage:       IF_FEATURE_RMDIR_LONG_OPTIONS(
+//usage:     "\n       -p|--parents    Include parents"
+//usage:     "\n       --ignore-fail-on-non-empty"
+//usage:       )
+//usage:       IF_NOT_FEATURE_RMDIR_LONG_OPTIONS(
+//usage:     "\n       -p      Include parents"
+//usage:       )
+//usage:
+//usage:#define rmdir_example_usage
+//usage:       "# rmdir /tmp/foo\n"
 
+#include "libbb.h"
 
-/* Return true if a path is composed of multiple components.  */
+/* This is a NOFORK applet. Be very careful! */
 
-static int
-multiple_components_p (const char *path)
-{
-       const char *s = path;
-
-       while (s[0] != '\0' && s[0] != '/')
-               s++;
 
-       while (s[0] == '/')
-               s++;
+#define PARENTS          (1 << 0)
+//efine VERBOSE          (1 << 1) //accepted but ignored
+#define IGNORE_NON_EMPTY (1 << 2)
 
-       return (s[0] != '\0');
-}
-
-
-/* Remove a directory.  Returns 0 if successful, -1 on error.  */
-
-static int
-remove_directory (char *path, int flags)
-{
-       if (!(flags & FILEUTILS_RECUR)) {
-               if (rmdir (path) < 0) {
-                       perror_msg ("unable to remove `%s'", path);
-                       return -1;
-               }
-       } else {
-               if (remove_directory (path, 0) < 0)
-                       return -1;
-
-               if (multiple_components_p (path))
-                       if (remove_directory (dirname (path), flags) < 0)
-                               return -1;
-       }
-
-       return 0;
-}
-
-
-extern int
-rmdir_main (int argc, char **argv)
+int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rmdir_main(int argc UNUSED_PARAM, char **argv)
 {
        int status = EXIT_SUCCESS;
-       int flags = 0;
-       int i, opt;
-
-       while ((opt = getopt (argc, argv, "p")) != -1)
-               switch (opt) {
-                       case 'p':
-                               flags |= FILEUTILS_RECUR;
-                               break;
+       int flags;
+       char *path;
+
+#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
+       static const char rmdir_longopts[] ALIGN1 =
+               "parents\0"                  No_argument "p"
+               "verbose\0"                  No_argument "v"
+               /* 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, "pv");
+       argv += optind;
+
+       if (!*argv) {
+               bb_show_usage();
+       }
 
-                       default:
-                               show_usage ();
+       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;
                }
-
-       if (optind == argc)
-               show_usage();
-
-       for (i = optind; i < argc; i++)
-               if (remove_directory (argv[i], flags) < 0)
-                       status = EXIT_FAILURE;
+       } while (*++argv);
 
        return status;
 }