From e0bf91d7c612619526772605890538f0c3e44c05 Mon Sep 17 00:00:00 2001
From: Mark Whitley <markw@lineo.com>
Date: Tue, 13 Mar 2001 00:40:19 +0000
Subject: Applied patch from Christophe Boyanique to add -i support to rm.

---
 coreutils/rm.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'coreutils')

diff --git a/coreutils/rm.c b/coreutils/rm.c
index a84163272..6d92b5daa 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -33,11 +33,21 @@
 
 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, 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);
@@ -52,6 +62,13 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 		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);
@@ -79,6 +96,14 @@ extern int rm_main(int argc, char **argv)
 						break;
 					case 'f':
 						forceFlag = TRUE;
+#ifdef BB_FEATURE_RM_INTERACTIVE
+						interactiveFlag = FALSE;
+#endif
+						break;
+					case 'i':
+#ifdef BB_FEATURE_RM_INTERACTIVE
+						interactiveFlag = TRUE;
+#endif
 						break;
 					case '-':
 						stopIt = TRUE;
-- 
cgit v1.2.3