SuS2 says rmdir must provide -p -- backport patch from Matt

diff --git a/busybox/coreutils/rmdir.c b/busybox/coreutils/rmdir.c
index 2c280376f84cdd02e70b28f898b3158856c70f38..cac27cac903b7ed79521f6855737314778125bb7 100644 (file)
--- a/busybox/coreutils/rmdir.c
+++ b/busybox/coreutils/rmdir.c
@@ -22,24 +22,76 @@
  *
  */
 
-#include <stdio.h>
-#include <errno.h>
+#include <getopt.h>
 #include <unistd.h>
 #include <stdlib.h>
+
 #include "busybox.h"
 
-extern int rmdir_main(int argc, char **argv)
+
+/* 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 status = EXIT_SUCCESS;
+       int flags = 0;
+       int i, opt;
 
-       if (argc == 1 || **(argv + 1) == '-')
+       while ((opt = getopt (argc, argv, "p")) != -1)
+               switch (opt) {
+                       case 'p':
+                               flags |= FILEUTILS_RECUR;
+                               break;
+
+                       default:
+                               show_usage ();
+               }
+
+       if (optind == argc)
                show_usage();
 
-       while (--argc > 0) {
-               if (rmdir(*(++argv)) == -1) {
-                       perror_msg("%s", *argv);
+       for (i = optind; i < argc; i++)
+               if (remove_directory (argv[i], flags) < 0)
                        status = EXIT_FAILURE;
-               }
-       }
+
        return status;
 }

diff --git a/busybox/rmdir.c b/busybox/rmdir.c
index 2c280376f84cdd02e70b28f898b3158856c70f38..cac27cac903b7ed79521f6855737314778125bb7 100644 (file)
--- a/busybox/rmdir.c
+++ b/busybox/rmdir.c
@@ -22,24 +22,76 @@
  *
  */
 
-#include <stdio.h>
-#include <errno.h>
+#include <getopt.h>
 #include <unistd.h>
 #include <stdlib.h>
+
 #include "busybox.h"
 
-extern int rmdir_main(int argc, char **argv)
+
+/* 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 status = EXIT_SUCCESS;
+       int flags = 0;
+       int i, opt;
 
-       if (argc == 1 || **(argv + 1) == '-')
+       while ((opt = getopt (argc, argv, "p")) != -1)
+               switch (opt) {
+                       case 'p':
+                               flags |= FILEUTILS_RECUR;
+                               break;
+
+                       default:
+                               show_usage ();
+               }
+
+       if (optind == argc)
                show_usage();
 
-       while (--argc > 0) {
-               if (rmdir(*(++argv)) == -1) {
-                       perror_msg("%s", *argv);
+       for (i = optind; i < argc; i++)
+               if (remove_directory (argv[i], flags) < 0)
                        status = EXIT_FAILURE;
-               }
-       }
+
        return status;
 }