Update the default config to not ask stuff

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index e6132ab3520adb9aded77a3e270fb7b57bdd45d8..39609e7b828b4d4c4eb1dccb91875dea75f31289 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -1,9 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini rm implementation for busybox
  *
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Copyright (C) 1999 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
@@ -21,74 +21,46 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
 
-static const char* rm_usage = "rm [OPTION]... FILE...\n\n"
-"Remove (unlink) the FILE(s).\n\n"
-"Options:\n"
-"\t-f\tremove existing destinations, never prompt\n"
-"\t-r\tremove the contents of directories recursively\n";
-
-
-static int recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-static const char *srcName;
-
-
-static int fileAction(const char *fileName, struct stat* statbuf)
-{
-    if (unlink( fileName) < 0 ) {
-       perror( fileName);
-       return ( FALSE);
-    }
-    return ( TRUE);
-}
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Size reduction.
+ */
 
-static int dirAction(const char *fileName, struct stat* statbuf)
-{
-    if (rmdir( fileName) < 0 ) {
-       perror( fileName);
-       return ( FALSE);
-    }
-    return ( TRUE);
-}
+#include <unistd.h>
+#include "busybox.h"
 
 extern int rm_main(int argc, char **argv)
 {
+       int status = 0;
+       int flags = 0;
+       unsigned long opt;
 
-    if (argc < 2) {
-       usage( rm_usage);
-    }
-    argc--;
-    argv++;
+       bb_opt_complementaly = "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 (**argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 'r':
-               recursiveFlag = TRUE;
-               break;
-           case 'f':
-               forceFlag = TRUE;
-               break;
-           default:
-               usage( rm_usage);
-           }
-       argc--;
-       argv++;
-    }
+       if (*(argv += optind) != NULL) {
+               do {
+                       const char *base = bb_get_last_path_component(*argv);
 
-    while (argc-- > 0) {
-       srcName = *(argv++);
-       if (recursiveAction( srcName, recursiveFlag, FALSE, TRUE, 
-                              fileAction, dirAction) == FALSE) {
-           exit( FALSE);
+                       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();
        }
-    }
-    exit( TRUE);
+
+       return status;
 }