X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Frm.c;h=e4e9bb0be48631471db33c38d58717d56aacb214;hb=843c5ef0f95e0a6f61f4e27d0355aca5e09ee6b1;hp=a3542aaf63da7747751ed813f249cb9522d4ff37;hpb=cc165b9083e8e4fb01992a8e0d97ecf08cb6dcdd;p=oweals%2Fbusybox.git

diff --git a/coreutils/rm.c b/coreutils/rm.c
index a3542aaf6..e4e9bb0be 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -2,13 +2,8 @@
 /*
  * Mini rm implementation for busybox
  *
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- *
- * INTERACTIVE feature Copyright (C) 2001 by Alcove
- *   written by Christophe Boyanique <Christophe.Boyanique@fr.alcove.com>
- *   for Ipanema Technologies
  *
  * 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
@@ -26,113 +21,46 @@
  *
  */
 
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include "busybox.h"
-
-static int recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-#ifdef BB_FEATURE_RM_INTERACTIVE
-	static int interactiveFlag = FALSE;
-#endif
-static const char *srcName;
-
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
 
-static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
-{
-#ifdef BB_FEATURE_RM_INTERACTIVE
-	if (interactiveFlag == TRUE) {
-		printf("rm: remove `%s'? ", fileName);
-		if (ask_confirmation() == 0)
-			return (TRUE);
-	}
-#endif
-	if (unlink(fileName) < 0) {
-		perror_msg("%s", 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, void* junk)
-{
-	if (recursiveFlag == FALSE) {
-		errno = EISDIR;
-		perror_msg("%s", fileName);
-		return (FALSE);
-	} 
-#ifdef BB_FEATURE_RM_INTERACTIVE
-	if (interactiveFlag == TRUE) {
-		printf("rm: remove directory `%s'? ", fileName);
-		if (ask_confirmation() == 0)
-			return (TRUE);
-	}
-#endif
-	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 opt;
-	int status = EXIT_SUCCESS;
-	struct stat statbuf;
-	
-	
-	/* do normal option parsing */
-	while ((opt = getopt(argc, argv, "Rrf-"
-#ifdef BB_FEATURE_RM_INTERACTIVE
-"i"
-#endif
-)) > 0) {
-		switch (opt) {
-			case 'R':
-			case 'r':
-				recursiveFlag = TRUE;
-				break;
-			case 'f':
-				forceFlag = TRUE;
-				break;
-#ifdef BB_FEATURE_RM_INTERACTIVE
-			case 'i':
-				interactiveFlag = TRUE;
-#endif
-				break;
-			default:
-				show_usage();
-		}
-	}
-	
-	if ((argc-optind) < 1 && forceFlag == FALSE) {
-		show_usage();
-	}
-#ifdef BB_FEATURE_RM_INTERACTIVE
-	if (forceFlag == TRUE)
-		interactiveFlag = FALSE;
-#endif
+	int status = 0;
+	int flags = 0;
+	unsigned long opt;
 
+	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;
 
-	while (optind < argc) {
-		srcName = argv[optind];
-		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 (*(argv += optind) != NULL) {
+		do {
+			const char *base = bb_get_last_path_component(*argv);
+
+			if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
+				bb_error_msg("cannot remove `.' or `..'");
+			} else if (remove_file(*argv, flags) >= 0) {
+				continue;
 			}
-		}
-		optind++;
+			status = 1;
+		} while (*++argv);
+	} else if (!(flags & FILEUTILS_FORCE)) {
+		bb_show_usage();
 	}
+
 	return status;
 }