X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Frm.c;h=51c9f4ceb5363f71919be999637198bc8a8b5771;hb=18d8a3b7e314036b915ba9e537832d4a52db75bc;hp=a9501ec7f004c23277b5c913c0657c5f1c8da1d2;hpb=f57c944e09417edcbcd69f2b01b937cadef39db2;p=oweals%2Fbusybox.git

diff --git a/coreutils/rm.c b/coreutils/rm.c
index a9501ec7f..51c9f4ceb 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -3,8 +3,8 @@
  * Mini rm implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ *
  *
  * 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
@@ -22,90 +22,56 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include "busybox.h"
 
-static int recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-static const char *srcName;
-
-
-static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
+extern int rm_main(int argc, char **argv)
 {
-	if (unlink(fileName) < 0) {
-		perror_msg("%s", fileName);
-		return (FALSE);
-	}
-	return (TRUE);
-}
+	int status = 0;
+	int opt;
+	int flags = 0;
+	int i;
 
-static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
-{
-	if (recursiveFlag == FALSE) {
-		errno = EISDIR;
-		perror_msg("%s", fileName);
-		return (FALSE);
-	} 
-	if (rmdir(fileName) < 0) {
-		perror_msg("%s", fileName);
-		return (FALSE);
+	while ((opt = getopt(argc, argv, "fiRr")) != -1) {
+		switch (opt) {
+		case 'f':
+			flags &= ~FILEUTILS_INTERACTIVE;
+			flags |= FILEUTILS_FORCE;
+			break;
+		case 'i':
+			flags &= ~FILEUTILS_FORCE;
+			flags |= FILEUTILS_INTERACTIVE;
+			break;
+		case 'R':
+		case 'r':
+			flags |= FILEUTILS_RECUR;
+			break;
+		}
 	}
-	return (TRUE);
-}
 
-extern int rm_main(int argc, char **argv)
-{
-	int status = EXIT_SUCCESS;
-	int stopIt=FALSE;
-	struct stat statbuf;
+	if (!(flags & FILEUTILS_FORCE) && optind == argc)
+		show_usage();
 
-	argc--;
-	argv++;
+	for (i = optind; i < argc; i++) {
+		char *base = get_last_path_component(argv[i]);
 
-	/* Parse any options */
-	while (argc > 0 && stopIt == FALSE) {
-		if (**argv == '-') {
-			while (*++(*argv))
-				switch (**argv) {
-					case 'R':
-					case 'r':
-						recursiveFlag = TRUE;
-						break;
-					case 'f':
-						forceFlag = TRUE;
-						break;
-					case '-':
-						stopIt = TRUE;
-						break;
-					default:
-						usage(rm_usage);
-				}
-			argc--;
-			argv++;
+		if (strcmp(base, ".") == 0 || strcmp(base, "..") == 0) {
+			error_msg("cannot remove `.' or `..'");
+			status = 1;
+			continue;
 		}
-		else
-			break;
-	}
 
-	if (argc < 1 && forceFlag == FALSE) {
-		usage(rm_usage);
+		if (remove_file(argv[i], flags) < 0)
+			status = 1;
 	}
 
-	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 (recursive_action(srcName, recursiveFlag, FALSE,
-								TRUE, fileAction, dirAction, NULL) == FALSE) {
-				status = EXIT_FAILURE;
-			}
-		}
-	}
 	return status;
 }