diff options
author | Ron Yorston <rmy@pobox.com> | 2023-07-13 08:06:26 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2023-07-13 08:06:26 +0100 |
commit | bd978d0256fd3a67de1a7dd54f1a37f9435be363 (patch) | |
tree | cb869384a533ac0d95fe787d75be6c050e1e7c1a /console-tools | |
parent | b2901ce8efa050da00e0f3a73f3be9bf9402deea (diff) | |
parent | d70256a5c719439cc6fab6a4571c1bb46178e4c7 (diff) | |
download | busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.tar.gz busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.tar.bz2 busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'console-tools')
-rw-r--r-- | console-tools/chvt.c | 2 | ||||
-rw-r--r-- | console-tools/clear.c | 2 | ||||
-rw-r--r-- | console-tools/deallocvt.c | 2 | ||||
-rw-r--r-- | console-tools/dumpkmap.c | 2 | ||||
-rw-r--r-- | console-tools/fgconsole.c | 2 | ||||
-rw-r--r-- | console-tools/kbd_mode.c | 2 | ||||
-rw-r--r-- | console-tools/loadfont.c | 2 | ||||
-rw-r--r-- | console-tools/loadkmap.c | 2 | ||||
-rw-r--r-- | console-tools/openvt.c | 2 | ||||
-rw-r--r-- | console-tools/reset.c | 2 | ||||
-rw-r--r-- | console-tools/resize.c | 4 | ||||
-rw-r--r-- | console-tools/setconsole.c | 2 | ||||
-rw-r--r-- | console-tools/setkeycodes.c | 2 | ||||
-rw-r--r-- | console-tools/setlogcons.c | 2 | ||||
-rw-r--r-- | console-tools/showkey.c | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c index 7c2814d1c..2444e1f9d 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config CHVT | 9 | //config:config CHVT |
10 | //config: bool "chvt (2 kb)" | 10 | //config: bool "chvt (2.2 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: This program is used to change to another terminal. | 13 | //config: This program is used to change to another terminal. |
diff --git a/console-tools/clear.c b/console-tools/clear.c index 09ef1ea68..e1bf2c313 100644 --- a/console-tools/clear.c +++ b/console-tools/clear.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config CLEAR | 9 | //config:config CLEAR |
10 | //config: bool "clear (tiny)" | 10 | //config: bool "clear (371 bytes)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: This program clears the terminal screen. | 13 | //config: This program clears the terminal screen. |
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index 6cd54653c..f03ad079b 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | //config:config DEALLOCVT | 10 | //config:config DEALLOCVT |
11 | //config: bool "deallocvt (1.9 kb)" | 11 | //config: bool "deallocvt (2.2 kb)" |
12 | //config: default y | 12 | //config: default y |
13 | //config: help | 13 | //config: help |
14 | //config: This program deallocates unused virtual consoles. | 14 | //config: This program deallocates unused virtual consoles. |
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c index 3d8de6bed..957d16529 100644 --- a/console-tools/dumpkmap.c +++ b/console-tools/dumpkmap.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config DUMPKMAP | 9 | //config:config DUMPKMAP |
10 | //config: bool "dumpkmap (1.6 kb)" | 10 | //config: bool "dumpkmap (1.9 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: This program dumps the kernel's keyboard translation table to | 13 | //config: This program dumps the kernel's keyboard translation table to |
diff --git a/console-tools/fgconsole.c b/console-tools/fgconsole.c index 9bfb68017..b6dbc472b 100644 --- a/console-tools/fgconsole.c +++ b/console-tools/fgconsole.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config FGCONSOLE | 9 | //config:config FGCONSOLE |
10 | //config: bool "fgconsole (1.5 kb)" | 10 | //config: bool "fgconsole (1.8 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: This program prints active (foreground) console number. | 13 | //config: This program prints active (foreground) console number. |
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c index b0b963ee0..1ec25757d 100644 --- a/console-tools/kbd_mode.c +++ b/console-tools/kbd_mode.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
10 | */ | 10 | */ |
11 | //config:config KBD_MODE | 11 | //config:config KBD_MODE |
12 | //config: bool "kbd_mode (4.1 kb)" | 12 | //config: bool "kbd_mode (4.3 kb)" |
13 | //config: default y | 13 | //config: default y |
14 | //config: help | 14 | //config: help |
15 | //config: This program reports and sets keyboard mode. | 15 | //config: This program reports and sets keyboard mode. |
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 81a0e6aa8..cec5e19cd 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Licensed under GPLv2, see file LICENSE in this source tree. | 10 | * Licensed under GPLv2, see file LICENSE in this source tree. |
11 | */ | 11 | */ |
12 | //config:config LOADFONT | 12 | //config:config LOADFONT |
13 | //config: bool "loadfont (5.2 kb)" | 13 | //config: bool "loadfont (5.4 kb)" |
14 | //config: default y | 14 | //config: default y |
15 | //config: help | 15 | //config: help |
16 | //config: This program loads a console font from standard input. | 16 | //config: This program loads a console font from standard input. |
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index c038e2d22..22e918dbf 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config LOADKMAP | 9 | //config:config LOADKMAP |
10 | //config: bool "loadkmap (1.8 kb)" | 10 | //config: bool "loadkmap (2.1 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: This program loads a keyboard translation table from | 13 | //config: This program loads a keyboard translation table from |
diff --git a/console-tools/openvt.c b/console-tools/openvt.c index db2f073b2..c35617eb8 100644 --- a/console-tools/openvt.c +++ b/console-tools/openvt.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | //config:config OPENVT | 10 | //config:config OPENVT |
11 | //config: bool "openvt (7.2 kb)" | 11 | //config: bool "openvt (7.4 kb)" |
12 | //config: default y | 12 | //config: default y |
13 | //config: help | 13 | //config: help |
14 | //config: This program is used to start a command on an unused | 14 | //config: This program is used to start a command on an unused |
diff --git a/console-tools/reset.c b/console-tools/reset.c index bf0814da7..74fe3cb50 100644 --- a/console-tools/reset.c +++ b/console-tools/reset.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | //config:config RESET | 10 | //config:config RESET |
11 | //config: bool "reset (345 bytes)" | 11 | //config: bool "reset (676 bytes)" |
12 | //config: default y | 12 | //config: default y |
13 | //config: help | 13 | //config: help |
14 | //config: This program is used to reset the terminal screen, if it | 14 | //config: This program is used to reset the terminal screen, if it |
diff --git a/console-tools/resize.c b/console-tools/resize.c index 056e33750..6fa7ce9ea 100644 --- a/console-tools/resize.c +++ b/console-tools/resize.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config RESIZE | 9 | //config:config RESIZE |
10 | //config: bool "resize (903 bytes)" | 10 | //config: bool "resize (1.2 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: This program is used to (re)set the width and height of your current | 13 | //config: This program is used to (re)set the width and height of your current |
@@ -45,7 +45,7 @@ static void | |||
45 | onintr(int sig UNUSED_PARAM) | 45 | onintr(int sig UNUSED_PARAM) |
46 | { | 46 | { |
47 | tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p); | 47 | tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p); |
48 | _exit(EXIT_FAILURE); | 48 | _exit_FAILURE(); |
49 | } | 49 | } |
50 | 50 | ||
51 | int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 51 | int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c index 461a98c6a..4e625890a 100644 --- a/console-tools/setconsole.c +++ b/console-tools/setconsole.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | //config:config SETCONSOLE | 10 | //config:config SETCONSOLE |
11 | //config: bool "setconsole (3.6 kb)" | 11 | //config: bool "setconsole (3.8 kb)" |
12 | //config: default y | 12 | //config: default y |
13 | //config: help | 13 | //config: help |
14 | //config: Redirect writes to /dev/console to another device, | 14 | //config: Redirect writes to /dev/console to another device, |
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index 5de18b8ea..03accec2f 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
10 | */ | 10 | */ |
11 | //config:config SETKEYCODES | 11 | //config:config SETKEYCODES |
12 | //config: bool "setkeycodes (2.1 kb)" | 12 | //config: bool "setkeycodes (2.4 kb)" |
13 | //config: default y | 13 | //config: default y |
14 | //config: help | 14 | //config: help |
15 | //config: This program loads entries into the kernel's scancode-to-keycode | 15 | //config: This program loads entries into the kernel's scancode-to-keycode |
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c index e9c2f516e..a94c0035a 100644 --- a/console-tools/setlogcons.c +++ b/console-tools/setlogcons.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
10 | */ | 10 | */ |
11 | //config:config SETLOGCONS | 11 | //config:config SETLOGCONS |
12 | //config: bool "setlogcons (1.8 kb)" | 12 | //config: bool "setlogcons (2 kb)" |
13 | //config: default y | 13 | //config: default y |
14 | //config: help | 14 | //config: help |
15 | //config: This program redirects the output console of kernel messages. | 15 | //config: This program redirects the output console of kernel messages. |
diff --git a/console-tools/showkey.c b/console-tools/showkey.c index 84eb38a0a..87532a8ac 100644 --- a/console-tools/showkey.c +++ b/console-tools/showkey.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config SHOWKEY | 9 | //config:config SHOWKEY |
10 | //config: bool "showkey (4.7 kb)" | 10 | //config: bool "showkey (4.9 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: Shows keys pressed. | 13 | //config: Shows keys pressed. |