diff options
| -rw-r--r-- | Config.h | 3 | ||||
| -rw-r--r-- | Config.h.Hurd | 3 | ||||
| -rw-r--r-- | applets/usage.h | 7 | ||||
| -rw-r--r-- | include/usage.h | 7 | ||||
| -rw-r--r-- | usage.h | 7 |
5 files changed, 3 insertions, 24 deletions
@@ -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 621fbb5a9..87be05f63 100644 --- 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 d85857fb5..2c7f9c277 100644 --- 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 d85857fb5..2c7f9c277 100644 --- 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 \ @@ -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 \ |