setconsole: since SUSE version has no -r, nuke our --reset longopt

Why we even bother inventing incompatible longopts?!

function                                             old     new   delta
packed_usage                                       31734   31738      +4
static.setconsole_longopts                             9       -      -9
setconsole_main                                       94      84     -10
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/1 up/down: 4/-19)             Total: -15 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index ad0f756cac739bd7fdf1d46b4cb02aa34ee85554..fa5269ebbdc232d692aa9b3134df0f3415643d3c 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -25,11 +25,15 @@
 //kbuild:lib-$(CONFIG_SETCONSOLE) += setconsole.o
 
 //usage:#define setconsole_trivial_usage
-//usage:       "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
+//usage:       "[-r] [DEVICE]"
 //usage:#define setconsole_full_usage "\n\n"
 //usage:       "Redirect system console output to DEVICE (default: /dev/tty)\n"
 //usage:     "\n       -r      Reset output to /dev/console"
 
+/* It was a bbox-specific invention, but SUSE does have a similar utility.
+ * SUSE has no -r option, though.
+ */
+
 #include "libbb.h"
 
 int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -38,12 +42,6 @@ int setconsole_main(int argc UNUSED_PARAM, char **argv)
        const char *device = CURRENT_TTY;
        bool reset;
 
-#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-       static const char setconsole_longopts[] ALIGN1 =
-               "reset\0" No_argument "r"
-               ;
-       applet_long_options = setconsole_longopts;
-#endif
        /* at most one non-option argument */
        opt_complementary = "?1";
        reset = getopt32(argv, "r");