Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / rm.c

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 477d3af..042fba1 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -1,93 +1,67 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini rm implementation for busybox
  *
- * Copyright (C) 1998 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) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#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 = "Usage: rm [OPTION]... FILE...\n"
-"Remove (unlink) the FILE(s).\n\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;
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Size reduction.
+ */
 
+//usage:#define rm_trivial_usage
+//usage:       "[-irf] FILE..."
+//usage:#define rm_full_usage "\n\n"
+//usage:       "Remove (unlink) FILEs\n"
+//usage:     "\n       -i      Always prompt before removing"
+//usage:     "\n       -f      Never prompt"
+//usage:     "\n       -R,-r   Recurse"
+//usage:
+//usage:#define rm_example_usage
+//usage:       "$ rm -rf /tmp/foo\n"
 
-static int fileAction(const char *fileName, struct stat* statbuf)
-{
-    if (unlink( fileName) < 0 ) {
-       perror( fileName);
-       return ( FALSE);
-    }
-    return ( TRUE);
-}
+#include "libbb.h"
 
-static int dirAction(const char *fileName, struct stat* statbuf)
-{
-    if (rmdir( fileName) < 0 ) {
-       perror( fileName);
-       return ( FALSE);
-    }
-    return ( TRUE);
-}
+/* This is a NOFORK applet. Be very careful! */
 
-extern int rm_main(int argc, char **argv)
+int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rm_main(int argc UNUSED_PARAM, char **argv)
 {
+       int status = 0;
+       int flags = 0;
+       unsigned opt;
 
-    if (argc < 2) {
-       fprintf(stderr, "Usage: %s", rm_usage);
-       exit (FALSE);
-    }
-    argc--;
-    argv++;
+       opt_complementary = "f-i:i-f";
+       /* -v (verbose) is ignored */
+       opt = getopt32(argv, "fiRrv");
+       argv += optind;
+       if (opt & 1)
+               flags |= FILEUTILS_FORCE;
+       if (opt & 2)
+               flags |= FILEUTILS_INTERACTIVE;
+       if (opt & (8|4))
+               flags |= FILEUTILS_RECUR;
 
-    /* Parse any options */
-    while (**argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 'r':
-               recursiveFlag = TRUE;
-               break;
-           case 'f':
-               forceFlag = TRUE;
-               break;
-           default:
-               fprintf(stderr, "Usage: %s\n", rm_usage);
-               exit(FALSE);
-           }
-       argc--;
-       argv++;
-    }
+       if (*argv != NULL) {
+               do {
+                       const char *base = bb_get_last_path_component_strip(*argv);
 
-    while (argc-- > 0) {
-       srcName = *(argv++);
-       if (recursiveAction( srcName, recursiveFlag, TRUE, TRUE, 
-                              fileAction, dirAction) == FALSE) {
-           exit( FALSE);
+                       if (DOT_OR_DOTDOT(base)) {
+                               bb_error_msg("can't 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;
 }