emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setconsole: much better help text

Browse Source 
Was:

    Usage: setconsole [-r] [DEVICE]

    Redirect system console output to DEVICE (default: /dev/tty)

        -r	Reset output to /dev/console

Now:

    Usage: setconsole [-r] [DEVICE]

    Make writes to /dev/console appear on DEVICE (default: /dev/tty).
    Does not redirect kernel log output or reads from /dev/console.

        -r	Reset: writes to /dev/console go to kernel log tty(s)

function                                             old     new   delta
packed_usage                                       31766   31777     +11
setconsole_main                                       84      78      -6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-07 17:36:41 +02:00
parent 1a1203ff89
commit 316d38e258
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
console-tools/setconsole.c
View File

@ -12,8 +12,10 @@
//config: default y //config: default y
//config: select PLATFORM_LINUX //config: select PLATFORM_LINUX
//config: help //config: help
//config: This program redirects the system console to another device, //config: Redirect writes to /dev/console to another device,
//config: like the current tty while logged in via telnet. //config: like the current tty while logged in via telnet.
//config: This does not redirect kernel log, only writes
//config: from user space.
//config: //config:
//config:config FEATURE_SETCONSOLE_LONG_OPTIONS //config:config FEATURE_SETCONSOLE_LONG_OPTIONS
//config: bool "Enable long options" //config: bool "Enable long options"
@ -27,8 +29,10 @@
//usage:#define setconsole_trivial_usage //usage:#define setconsole_trivial_usage
//usage: "[-r] [DEVICE]" //usage: "[-r] [DEVICE]"
//usage:#define setconsole_full_usage "\n\n" //usage:#define setconsole_full_usage "\n\n"
//usage: "Redirect system console output to DEVICE (default: /dev/tty)\n" //usage: "Make writes to /dev/console appear on DEVICE (default: /dev/tty)."
//usage: "\n -r Reset output to /dev/console" //usage: "\n""Does not redirect kernel log output or reads from /dev/console."
//usage: "\n"
//usage: "\n"" -r Reset: writes to /dev/console go to kernel log tty(s)"
/* It was a bbox-specific invention, but SUSE does have a similar utility. /* It was a bbox-specific invention, but SUSE does have a similar utility.
* SUSE has no -r option, though. * SUSE has no -r option, though.
@ -40,7 +44,7 @@ int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int setconsole_main(int argc UNUSED_PARAM, char **argv) int setconsole_main(int argc UNUSED_PARAM, char **argv)
{ {
const char *device = CURRENT_TTY; const char *device = CURRENT_TTY;
bool reset; int reset;
/* at most one non-option argument */ /* at most one non-option argument */
opt_complementary = "?1"; opt_complementary = "?1";
@ -54,6 +58,9 @@ int setconsole_main(int argc UNUSED_PARAM, char **argv)
device = DEV_CONSOLE; device = DEV_CONSOLE;
} }
//TODO: fails if TIOCCONS redir is already active to some tty.
//I think SUSE version first does TIOCCONS on /dev/console fd (iow: resets)
//then TIOCCONS to new tty?
xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL); xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }