X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Frm.c;h=975f2267b1f219cfd427601b2707e0654c0b009f;hb=6b1e3d7e734f85a08c2e4414764f03a7f880b3e6;hp=f49ada5e184a5fa1d1815b523f60b0cf0ef40aea;hpb=c49960189a04b73e033016bd0f43fbb950f800e1;p=oweals%2Fbusybox.git

diff --git a/coreutils/rm.c b/coreutils/rm.c
index f49ada5e1..975f2267b 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -1,93 +1,55 @@
+/* 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
- * 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
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-
-static const char* rm_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";
+/* 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 recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-static const char *srcName;
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
 
-static int fileAction(const char *fileName, struct stat* statbuf)
+int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rm_main(int argc UNUSED_PARAM, char **argv)
 {
-    if (unlink( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
-}
-
-static int dirAction(const char *fileName, struct stat* statbuf)
-{
-    if (rmdir( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
-}
-
-extern int rm_main(int argc, char **argv)
-{
-
-    if (argc < 2) {
-	usage( rm_usage);
-    }
-    argc--;
-    argv++;
-
-    /* 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++;
-    }
-
-    while (argc-- > 0) {
-	srcName = *(argv++);
-	if (recursiveAction( srcName, recursiveFlag, TRUE, TRUE, 
-			       fileAction, dirAction) == FALSE) {
-	    exit( FALSE);
+	int status = 0;
+	int flags = 0;
+	unsigned opt;
+
+	opt_complementary = "f-i:i-f";
+	opt = getopt32(argv, "fiRr");
+	argv += optind;
+	if (opt & 1)
+		flags |= FILEUTILS_FORCE;
+	if (opt & 2)
+		flags |= FILEUTILS_INTERACTIVE;
+	if (opt & 12)
+		flags |= FILEUTILS_RECUR;
+
+	if (*argv != NULL) {
+		do {
+			const char *base = bb_get_last_path_component_strip(*argv);
+
+			if (DOT_OR_DOTDOT(base)) {
+				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;
 }