ab2338110
Denys Vlasenko
2017-08-06
Subject
setconsole: since SUSE version has no -r, nuke our --reset longopt
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
console-tools/setconsole.c+5 -7
| @@ -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"); | |