getopt_ulflags -> getopt32.

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

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 83b27c9bd6a22586a5c8d7c84d5e15d48fe8f72c..05ea0e9ffe7c6b2104902e0d5ed501e09e164e88 100644 (file)
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -1,96 +1,60 @@
 /* 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 tarball for details.
  */
 
-#include <getopt.h>
-#include <unistd.h>
-#include <stdlib.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"
 
-
-/* Return true if a path is composed of multiple components.  */
-
-static int
-multiple_components_p (const char *path)
-{
-       const char *s = path;
-
-       while (s[0] != '\0' && s[0] != '/')
-               s++;
-
-       while (s[0] == '/')
-               s++;
-
-       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)
 {
        int status = EXIT_SUCCESS;
-       int flags = 0;
-       int i, opt;
+       int flags;
+       int do_dot;
+       char *path;
 
-       while ((opt = getopt (argc, argv, "p")) != -1)
-               switch (opt) {
-                       case 'p':
-                               flags |= FILEUTILS_RECUR;
-                               break;
+       flags = getopt32(argc, argv, "p");
 
-                       default:
-                               show_usage ();
-               }
+       argv += optind;
 
-       if (optind == argc)
-               show_usage();
+       if (!*argv) {
+               bb_show_usage();
+       }
 
-       for (i = optind; i < argc; i++)
-               if (remove_directory (argv[i], flags) < 0)
-                       status = EXIT_FAILURE;
+       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;
 }