Removed obsoleted BB_FEATURE_RM_INTERACTIVE

diff --git a/Config.h b/Config.h
index f7859479db1951d028698d804327a8249bb38f4b..4f01907453cef24d599c3810c18649eaf4d5c7f4 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -231,9 +231,6 @@
 // (i.e. in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
-// use -i (interactive) flag for rm
-//#define BB_FEATURE_RM_INTERACTIVE
-//
 // Enable support for creation of tar files.
 #define BB_FEATURE_TAR_CREATE
 //

diff --git a/Config.h.Hurd b/Config.h.Hurd
index 621fbb5a936e7b536f23eecdbd736c647e603968..87be05f638cb4340ef3fe9d6b595887fe94e28bd 100644 (file)
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -211,9 +211,6 @@
 // (i.e. in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
-// use -i (interactive) flag for rm
-//#define BB_FEATURE_RM_INTERACTIVE
-//
 // Enable support for creation of tar files.
 #define BB_FEATURE_TAR_CREATE
 //

diff --git a/applets/usage.h b/applets/usage.h
index d85857fb5fde7115d11f589ee7d6b7f34ccc05db..2c7f9c27789d4df4d195c4871c061f34fef30111 100644 (file)
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -1264,18 +1264,13 @@
 #define reset_full_usage \
        "Resets the screen."
 
-#ifdef BB_FEATURE_RM_INTERACTIVE
-  #define USAGE_RM_INTERACTIVE(a) a
-#else
-  #define USAGE_RM_INTERACTIVE(a)
-#endif
 #define rm_trivial_usage \
        "[OPTION]... FILE..."
 #define rm_full_usage \
        "Remove (unlink) the FILE(s).  You may use '--' to\n" \
        "indicate that all following arguments are non-options.\n\n" \
        "Options:\n" \
-       USAGE_RM_INTERACTIVE("\t-i\t\talways prompt before removing each destinations\n") \
+       "\t-i\t\talways prompt before removing each destinations\n" \
        "\t-f\t\tremove existing destinations, never prompt\n" \
        "\t-r or -R\tremove the contents of directories recursively"
 #define rm_example_usage \

diff --git a/include/usage.h b/include/usage.h
index d85857fb5fde7115d11f589ee7d6b7f34ccc05db..2c7f9c27789d4df4d195c4871c061f34fef30111 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -1264,18 +1264,13 @@
 #define reset_full_usage \
        "Resets the screen."
 
-#ifdef BB_FEATURE_RM_INTERACTIVE
-  #define USAGE_RM_INTERACTIVE(a) a
-#else
-  #define USAGE_RM_INTERACTIVE(a)
-#endif
 #define rm_trivial_usage \
        "[OPTION]... FILE..."
 #define rm_full_usage \
        "Remove (unlink) the FILE(s).  You may use '--' to\n" \
        "indicate that all following arguments are non-options.\n\n" \
        "Options:\n" \
-       USAGE_RM_INTERACTIVE("\t-i\t\talways prompt before removing each destinations\n") \
+       "\t-i\t\talways prompt before removing each destinations\n" \
        "\t-f\t\tremove existing destinations, never prompt\n" \
        "\t-r or -R\tremove the contents of directories recursively"
 #define rm_example_usage \

diff --git a/usage.h b/usage.h
index d85857fb5fde7115d11f589ee7d6b7f34ccc05db..2c7f9c27789d4df4d195c4871c061f34fef30111 100644 (file)
--- a/usage.h
+++ b/usage.h
@@ -1264,18 +1264,13 @@
 #define reset_full_usage \
        "Resets the screen."
 
-#ifdef BB_FEATURE_RM_INTERACTIVE
-  #define USAGE_RM_INTERACTIVE(a) a
-#else
-  #define USAGE_RM_INTERACTIVE(a)
-#endif
 #define rm_trivial_usage \
        "[OPTION]... FILE..."
 #define rm_full_usage \
        "Remove (unlink) the FILE(s).  You may use '--' to\n" \
        "indicate that all following arguments are non-options.\n\n" \
        "Options:\n" \
-       USAGE_RM_INTERACTIVE("\t-i\t\talways prompt before removing each destinations\n") \
+       "\t-i\t\talways prompt before removing each destinations\n" \
        "\t-f\t\tremove existing destinations, never prompt\n" \
        "\t-r or -R\tremove the contents of directories recursively"
 #define rm_example_usage \