X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Frm.c;h=975f2267b1f219cfd427601b2707e0654c0b009f;hb=5b492ee87614632e7bf5cd68fe0ce87dad30002a;hp=683bf8bdff2a45e040af20d6aae8285d55828cc6;hpb=3364d78b18386623e7af5da18ba1bb0cc6286279;p=oweals%2Fbusybox.git

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 683bf8bdf..975f2267b 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -2,103 +2,54 @@
 /*
  * 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>
-#include <errno.h>
-
-static const char *rm_usage = "rm [OPTION]... FILE...\n\n"
-	"Remove (unlink) the FILE(s).\n\n"
-	"Options:\n"
-
-	"\t-f\t\tremove existing destinations, never prompt\n"
-	"\t-r or -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, void* junk)
+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, void* junk)
-{
-	if (rmdir(fileName) < 0) {
-		perror(fileName);
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-extern int rm_main(int argc, char **argv)
-{
-	struct stat statbuf;
-
-	if (argc < 2) {
-		usage(rm_usage);
-	}
-	argc--;
-	argv++;
-
-	/* Parse any options */
-	while (**argv == '-') {
-		while (*++(*argv))
-			switch (**argv) {
-			case 'R':
-			case 'r':
-				recursiveFlag = TRUE;
-				break;
-			case 'f':
-				forceFlag = TRUE;
-				break;
-			default:
-				usage(rm_usage);
+	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;
 			}
-		argc--;
-		argv++;
+			status = 1;
+		} while (*++argv);
+	} else if (!(flags & FILEUTILS_FORCE)) {
+		bb_show_usage();
 	}
 
-	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 (recursiveAction(srcName, recursiveFlag, FALSE,
-								TRUE, fileAction, dirAction, NULL) == FALSE) {
-				exit(FALSE);
-			}
-		}
-	}
-	exit(TRUE);
+	return status;
 }