From 5e446146e49913157fea5894858c93b57b910022 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 18 Jul 2005 12:21:38 +0000
Subject: [PATCH] No need to force interaction on interactive terminals

---
 src/rm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/rm.c b/src/rm.c
index c1b5a80..f6779e9 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -143,11 +143,11 @@ int main(int argc, char * argv[])
 		switch(o)
 		{
 			case 'f':
-				prefs = prefs - (prefs & PREFS_i);
+				prefs -= prefs & PREFS_i;
 				prefs |= PREFS_f;
 				break;
 			case 'i':
-				prefs = prefs - (prefs & PREFS_f);
+				prefs -= prefs & PREFS_f;
 				prefs |= PREFS_i;
 				break;
 			case 'R':
@@ -159,7 +159,5 @@ int main(int argc, char * argv[])
 		}
 	if(optind == argc)
 		return _usage();
-	if(!(prefs & PREFS_f) && isatty(0))
-		prefs |= PREFS_i;
 	return _rm(&prefs, argc-optind, &argv[optind]);
 }