X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=rm.c;h=ea7f86ce100bfe7309a4b954e997cb480e936011;hb=9f0fedb8f693829e7869439a2ad43cc1c21a3786;hp=f49ada5e184a5fa1d1815b523f60b0cf0ef40aea;hpb=c49960189a04b73e033016bd0f43fbb950f800e1;p=oweals%2Fbusybox.git

diff --git a/rm.c b/rm.c
index f49ada5e1..ea7f86ce1 100644
--- a/rm.c
+++ b/rm.c
@@ -1,10 +1,15 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini rm implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -21,73 +26,113 @@
  *
  */
 
-#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";
-
+#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;
 
 
-static int fileAction(const char *fileName, struct stat* statbuf)
+static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
-    if (unlink( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
+#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);
 }
 
-static int dirAction(const char *fileName, struct stat* statbuf)
+static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 {
-    if (rmdir( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
+	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);
 }
 
 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;
+#ifdef BB_FEATURE_RM_INTERACTIVE
 
-    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++;
-    }
+				interactiveFlag = FALSE;
+#endif
+				break;
+#ifdef BB_FEATURE_RM_INTERACTIVE
+			case 'i':
+				interactiveFlag = TRUE;
+				forceFlag = FALSE;
+				break;
+#endif
+			default:
+				show_usage();
+		}
+	}
+	
+	if (argc == optind && forceFlag == FALSE) {
+		show_usage();
+	}
 
-    while (argc-- > 0) {
-	srcName = *(argv++);
-	if (recursiveAction( srcName, recursiveFlag, TRUE, TRUE, 
-			       fileAction, dirAction) == FALSE) {
-	    exit( FALSE);
+	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;
+			}
+		}
+		optind++;
 	}
-    }
-    exit( TRUE);
+	return status;
 }