Undo all of the ugliness and some of the bloat from 15412.

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index a9501ec7f004c23277b5c913c0657c5f1c8da1d2..59c639b884335995a7cf3220747a7a13be98374b 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -2,9 +2,8 @@
 /*
  * Mini rm implementation for busybox
  *
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Copyright (C) 1999,2000 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
@@ -22,90 +21,46 @@
  *
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-#include <errno.h>
-
-static int recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-static const char *srcName;
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
 
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Size reduction.
+ */
 
-static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
-{
-       if (unlink(fileName) < 0) {
-               perror_msg("%s", fileName);
-               return (FALSE);
-       }
-       return (TRUE);
-}
-
-static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
-{
-       if (recursiveFlag == FALSE) {
-               errno = EISDIR;
-               perror_msg("%s", fileName);
-               return (FALSE);
-       } 
-       if (rmdir(fileName) < 0) {
-               perror_msg("%s", fileName);
-               return (FALSE);
-       }
-       return (TRUE);
-}
+#include <unistd.h>
+#include "busybox.h"
 
-extern int rm_main(int argc, char **argv)
+int rm_main(int argc, char **argv)
 {
-       int status = EXIT_SUCCESS;
-       int stopIt=FALSE;
-       struct stat statbuf;
+       int status = 0;
+       int flags = 0;
+       unsigned long opt;
 
-       argc--;
-       argv++;
+       bb_opt_complementally = "f-i:i-f";
+       opt = bb_getopt_ulflags(argc, argv, "fiRr");
+       if(opt & 1)
+                               flags |= FILEUTILS_FORCE;
+       if(opt & 2)
+               flags |= FILEUTILS_INTERACTIVE;
+       if(opt & 12)
+               flags |= FILEUTILS_RECUR;
 
-       /* Parse any options */
-       while (argc > 0 && stopIt == FALSE) {
-               if (**argv == '-') {
-                       while (*++(*argv))
-                               switch (**argv) {
-                                       case 'R':
-                                       case 'r':
-                                               recursiveFlag = TRUE;
-                                               break;
-                                       case 'f':
-                                               forceFlag = TRUE;
-                                               break;
-                                       case '-':
-                                               stopIt = TRUE;
-                                               break;
-                                       default:
-                                               usage(rm_usage);
-                               }
-                       argc--;
-                       argv++;
-               }
-               else
-                       break;
-       }
-
-       if (argc < 1 && forceFlag == FALSE) {
-               usage(rm_usage);
-       }
+       if (*(argv += optind) != NULL) {
+               do {
+                       const char *base = bb_get_last_path_component(*argv);
 
-       while (argc-- > 0) {
-               srcName = *(argv++);
-               if (forceFlag == TRUE && lstat(srcName, &statbuf) != 0
-                       && errno == ENOENT) {
-                       /* do not reports errors for non-existent files if -f, just skip them */
-               } else {
-                       if (recursive_action(srcName, recursiveFlag, FALSE,
-                                                               TRUE, fileAction, dirAction, NULL) == FALSE) {
-                               status = EXIT_FAILURE;
+                       if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
+                               bb_error_msg("cannot remove `.' or `..'");
+                       } else if (remove_file(*argv, flags) >= 0) {
+                               continue;
                        }
-               }
+                       status = 1;
+               } while (*++argv);
+       } else if (!(flags & FILEUTILS_FORCE)) {
+               bb_show_usage();
        }
+
        return status;
 }