randomconfig fixes

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

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 3f6037170d80d1c037073b0131521902a9f1c696..955740494955666e7e4bf8c21861f5fbc41e70c1 100644 (file)
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -4,39 +4,58 @@
  *
  * 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
- * 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 source tree.
  */
+//config:config RMDIR
+//config:      bool "rmdir (3.4 kb)"
+//config:      default y
+//config:      help
+//config:      rmdir is used to remove empty directories.
+
+//applet:IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir))
+
+//kbuild:lib-$(CONFIG_RMDIR) += rmdir.o
 
 /* 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"
+//usage:#define rmdir_trivial_usage
+//usage:       "[OPTIONS] DIRECTORY..."
+//usage:#define rmdir_full_usage "\n\n"
+//usage:       "Remove DIRECTORY if it is empty\n"
+//usage:     "\n       -p      Include parents"
+//usage:       IF_LONG_OPTS(
+//usage:     "\n       --ignore-fail-on-non-empty"
+//usage:       )
+//usage:
+//usage:#define rmdir_example_usage
+//usage:       "# rmdir /tmp/foo\n"
+
+#include "libbb.h"
 
-extern int rmdir_main(int argc, char **argv)
+/* This is a NOFORK applet. Be very careful! */
+
+
+#define PARENTS          (1 << 0)
+#define VERBOSE          ((1 << 1) * ENABLE_FEATURE_VERBOSE)
+#define IGNORE_NON_EMPTY ((1 << 2) * ENABLE_LONG_OPTS)
+
+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;
-       int do_dot;
        char *path;
 
-       flags = bb_getopt_ulflags(argc, argv, "p");
-
+       flags = getopt32long(argv, "pv",
+               "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"
+               IF_FEATURE_VERBOSE(
+               "verbose\0"                  No_argument "v"
+               )
+       );
        argv += optind;
 
        if (!*argv) {
@@ -46,27 +65,30 @@ extern int rmdir_main(int argc, char **argv)
        do {
                path = *argv;
 
-               /* Record if the first char was a '.' so we can use dirname later. */
-               do_dot = (*path == '.');
+               while (1) {
+                       if (flags & VERBOSE) {
+                               printf("rmdir: removing directory, '%s'\n", path);
+                       }
 
-               do {
                        if (rmdir(path) < 0) {
-                               bb_perror_msg("`%s'", path);    /* Match gnu rmdir msg. */
+#if ENABLE_LONG_OPTS
+                               if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)
+                                       break;
+#endif
+                               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. */
+                       } else if (flags & PARENTS) {
+                               /* Note: path was not "" 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]) {
+                               /* Path is now just the parent component.  Dirname
+                                * returns "." if there are no parents.
+                                */
+                               if (NOT_LONE_CHAR(path, '.')) {
                                        continue;
                                }
                        }
                        break;
-               } while (1);
-               
+               }
        } while (*++argv);
 
        return status;