[BusyBox] Interactive rm patch

[Vladimir N. Oleynik]

I found small error in rm.c

Problem:
% rm -if *.o
Ok
% rm -fi *.o
remove bla-bla.o ?

This also must run without asks.


Patch (not addition code, only move):


--- rm.c~       Tue Mar 13 19:35:55 2001
+++ rm.c        Sat Mar 17 17:11:46 2001
@@ -100,9 +100,6 @@
                                                break;
                                        case 'f':
                                                forceFlag = TRUE;
-#ifdef BB_FEATURE_RM_INTERACTIVE
-                                               interactiveFlag = FALSE;
-#endif
                                                break;
                                        case 'i':
 #ifdef BB_FEATURE_RM_INTERACTIVE
@@ -125,6 +122,11 @@
        if (argc < 1 && forceFlag == FALSE) {
                show_usage();
        }
+
+#ifdef BB_FEATURE_RM_INTERACTIVE
+       if (forceFlag == TRUE)
+               interactiveFlag = FALSE;
+#endif

        while (argc-- > 0) {
                srcName = *(argv++);