*: use _exit() in sighandlers; showkey: do not use exit-thru-sighandler

While at it, make ESC sequences more readable; and removed check for isatty(stdin) in reset. Code shrink: text data bss dec hex filename 884771 936 17216 902923 dc70b busybox_old 884723 936 17216 902875 dc6db busybox_unstripped Signed-off-by: Marek Polacek <mmpolacek@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
author: Marek Polacek <mmpolacek@gmail.com> 2010-10-28 21:34:56 +0200
committer: Denys Vlasenko <vda.linux@googlemail.com> 2010-10-28 21:34:56 +0200
commit: 7b18107384d950358e146d42bf02b391fab5ffd6 (patch)
tree: 9994e2bcaa038c3128ed8b3bca99486e22f660fb /console-tools
parent: 02788ac7e2a44eee889aa1005e89076f928e964a (diff)
download: busybox-w32-7b18107384d950358e146d42bf02b391fab5ffd6.tar.gz
busybox-w32-7b18107384d950358e146d42bf02b391fab5ffd6.tar.bz2
busybox-w32-7b18107384d950358e146d42bf02b391fab5ffd6.zip
3 files changed, 41 insertions, 46 deletions
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 7dffdea18..1806ce742 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -8,11 +8,13 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
-#include "libbb.h"
 /* BTW, which "standard" package has this utility? It doesn't seem
 * to be ncurses, coreutils, console-tools... then what? */
+#include "libbb.h"
+#define ESC "\033"
 #if ENABLE_STTY
 int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #endif
@@ -26,15 +28,15 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
        /* no options, no getopt */
-        if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
+        if (/*isatty(STDIN_FILENO) &&*/ isatty(STDOUT_FILENO)) {
                /* See 'man 4 console_codes' for details:
                 * "ESC c"        -- Reset
                 * "ESC ( K"      -- Select user mapping
-                 * "ESC [ J"      -- Erase to the end of screen
                 * "ESC [ 0 m"    -- Reset all display attributes
+                 * "ESC [ J"      -- Erase to the end of screen
                 * "ESC [ ? 25 h" -- Make cursor visible
                 */
-                printf("\033c\033(K\033[J\033[0m\033[?25h");
+                printf(ESC"c" ESC"(K" ESC"[0m" ESC"[J" ESC"[?25h");
                /* http://bugs.busybox.net/view.php?id=1414:
                 * people want it to reset echo etc: */
 #if ENABLE_STTY
diff --git a/console-tools/resize.c b/console-tools/resize.c
index 12e50a116..fdfe2a6a0 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -17,7 +17,7 @@ static void
 onintr(int sig UNUSED_PARAM)
 {
        tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
-        exit(EXIT_FAILURE);
+        _exit(EXIT_FAILURE);
 }
 int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index 149ea6465..b29c84d6a 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -10,27 +10,7 @@
 #include "libbb.h"
 #include <linux/kd.h>
-// set raw tty mode
-// also used by microcom
-// libbb candidates?
-static void xget1(struct termios *t, struct termios *oldt)
-{
-        tcgetattr(STDIN_FILENO, oldt);
-        *t = *oldt;
-        cfmakeraw(t);
-}
-static void xset1(struct termios *tio)
-{
-        int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, tio);
-        if (ret) {
-                bb_perror_msg("can't tcsetattr for stdin");
-        }
-}
-/*
- * GLOBALS
- */
 struct globals {
        int kbmode;
        struct termios tio, tio0;
@@ -44,13 +24,22 @@ struct globals {
 } while (0)
-static void signal_handler(int signo)
+// set raw tty mode
+// also used by microcom
+// libbb candidates?
+static void xget1(struct termios *t, struct termios *oldt)
 {
-        // restore keyboard and console settings
+        tcgetattr(STDIN_FILENO, oldt);
-        xset1(&tio0);
+        *t = *oldt;
-        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
+        cfmakeraw(t);
-        // alarmed? -> exit 0
+}
-        exit(SIGALRM == signo);
+static void xset1(struct termios *t)
+{
+        int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t);
+        if (ret) {
+                bb_perror_msg("can't tcsetattr for stdin");
+        }
 }
 int showkey_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -62,20 +51,21 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
                OPT_s = (1<<2), // display only the raw scan-codes
        };
+        INIT_G();
        // FIXME: aks are all mutually exclusive
        getopt32(argv, "aks");
-        INIT_G();
        // get keyboard settings
        xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
        printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",
                kbmode == K_RAW ? "RAW" :
                        (kbmode == K_XLATE ? "XLATE" :
                                (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
-                                        (kbmode == K_UNICODE ? "UNICODE" : "?UNKNOWN?")))
+                                        (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
-                , (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress"
+                , (option_mask32 & OPT_a) ? "on EOF (ctrl-D)" : "10s after last keypress"
        );
        // prepare for raw mode
        xget1(&tio, &tio0);
        // put stdin in raw mode
@@ -83,34 +73,37 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
        if (option_mask32 & OPT_a) {
                unsigned char c;
                // just read stdin char by char
-                while (1 == safe_read(STDIN_FILENO, &c, 1)) {
+                while (1 == read(STDIN_FILENO, &c, 1)) {
                        printf("%3u 0%03o 0x%02x\r\n", c, c, c);
                        if (04 /*CTRL-D*/ == c)
                                break;
                }
        } else {
-                // we should exit on any signal
-                bb_signals(BB_FATAL_SIGS, signal_handler);
                // set raw keyboard mode
                xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
+                // we should exit on any signal; signals should interrupt read
+                bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
                // read and show scancodes
-                while (1) {
+                while (!bb_got_signal) {
                        char buf[18];
                        int i, n;
                        // setup 10s watchdog
                        alarm(10);
                        // read scancodes
                        n = read(STDIN_FILENO, buf, sizeof(buf));
                        i = 0;
                        while (i < n) {
-                                char c = buf[i];
-                                // show raw scancodes ordered? ->
                                if (option_mask32 & OPT_s) {
+                                        // show raw scancodes
                                        printf("0x%02x ", buf[i++]);
-                                // show interpreted scancodes (default) ? ->
                                } else {
+                                        // show interpreted scancodes (default)
+                                        char c = buf[i];
                                        int kc;
                                        if (i+2 < n
                                         && (c & 0x7f) == 0
@@ -130,9 +123,9 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
                }
        }
-        // cleanup
+        // restore keyboard and console settings
-        signal_handler(SIGALRM);
+        xset1(&tio0);
+        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
-        // should never be here!
        return EXIT_SUCCESS;
 }
author	Marek Polacek <mmpolacek@gmail.com>	2010-10-28 21:34:56 +0200
committer	Denys Vlasenko <vda.linux@googlemail.com>	2010-10-28 21:34:56 +0200
commit	7b18107384d950358e146d42bf02b391fab5ffd6 (patch)
tree	9994e2bcaa038c3128ed8b3bca99486e22f660fb /console-tools
parent	02788ac7e2a44eee889aa1005e89076f928e964a (diff)
download	busybox-w32-7b18107384d950358e146d42bf02b391fab5ffd6.tar.gz busybox-w32-7b18107384d950358e146d42bf02b391fab5ffd6.tar.bz2 busybox-w32-7b18107384d950358e146d42bf02b391fab5ffd6.zip

diff --git a/console-tools/reset.c b/console-tools/reset.c index 7dffdea18..1806ce742 100644 --- a/console-tools/reset.c +++ b/console-tools/reset.c
@@ -8,11 +8,13 @@
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		10
11	#include "libbb.h"
12
13	/* BTW, which "standard" package has this utility? It doesn't seem	11	/* BTW, which "standard" package has this utility? It doesn't seem
14	* to be ncurses, coreutils, console-tools... then what? */	12	* to be ncurses, coreutils, console-tools... then what? */
15		13
		14	#include "libbb.h"
		15
		16	#define ESC "\033"
		17
16	#if ENABLE_STTY	18	#if ENABLE_STTY
17	int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	19	int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
18	#endif	20	#endif
@@ -26,15 +28,15 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
26		28
27	/* no options, no getopt */	29	/* no options, no getopt */
28		30
29	if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {	31	if (/isatty(STDIN_FILENO) &&/ isatty(STDOUT_FILENO)) {
30	/* See 'man 4 console_codes' for details:	32	/* See 'man 4 console_codes' for details:
31	* "ESC c" -- Reset	33	* "ESC c" -- Reset
32	* "ESC ( K" -- Select user mapping	34	* "ESC ( K" -- Select user mapping
33	* "ESC [ J" -- Erase to the end of screen
34	* "ESC [ 0 m" -- Reset all display attributes	35	* "ESC [ 0 m" -- Reset all display attributes
		36	* "ESC [ J" -- Erase to the end of screen
35	* "ESC [ ? 25 h" -- Make cursor visible	37	* "ESC [ ? 25 h" -- Make cursor visible
36	*/	38	*/
37	printf("\033c\033(K\033[J\033[0m\033[?25h");	39	printf(ESC"c" ESC"(K" ESC"[0m" ESC"[J" ESC"[?25h");
38	/* http://bugs.busybox.net/view.php?id=1414:	40	/* http://bugs.busybox.net/view.php?id=1414:
39	* people want it to reset echo etc: */	41	* people want it to reset echo etc: */
40	#if ENABLE_STTY	42	#if ENABLE_STTY


diff --git a/console-tools/resize.c b/console-tools/resize.c index 12e50a116..fdfe2a6a0 100644 --- a/console-tools/resize.c +++ b/console-tools/resize.c
@@ -17,7 +17,7 @@ static void
17	onintr(int sig UNUSED_PARAM)	17	onintr(int sig UNUSED_PARAM)
18	{	18	{
19	tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);	19	tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
20	exit(EXIT_FAILURE);	20	_exit(EXIT_FAILURE);
21	}	21	}
22		22
23	int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	23	int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;


diff --git a/console-tools/showkey.c b/console-tools/showkey.c index 149ea6465..b29c84d6a 100644 --- a/console-tools/showkey.c +++ b/console-tools/showkey.c
@@ -10,27 +10,7 @@
10	#include "libbb.h"	10	#include "libbb.h"
11	#include <linux/kd.h>	11	#include <linux/kd.h>
12		12
13	// set raw tty mode
14	// also used by microcom
15	// libbb candidates?
16	static void xget1(struct termios t, struct termios oldt)
17	{
18	tcgetattr(STDIN_FILENO, oldt);
19	t = oldt;
20	cfmakeraw(t);
21	}
22
23	static void xset1(struct termios *tio)
24	{
25	int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, tio);
26	if (ret) {
27	bb_perror_msg("can't tcsetattr for stdin");
28	}
29	}
30		13
31	/*
32	* GLOBALS
33	*/
34	struct globals {	14	struct globals {
35	int kbmode;	15	int kbmode;
36	struct termios tio, tio0;	16	struct termios tio, tio0;
@@ -44,13 +24,22 @@ struct globals {
44	} while (0)	24	} while (0)
45		25
46		26
47	static void signal_handler(int signo)	27	// set raw tty mode
		28	// also used by microcom
		29	// libbb candidates?
		30	static void xget1(struct termios t, struct termios oldt)
48	{	31	{
49	// restore keyboard and console settings	32	tcgetattr(STDIN_FILENO, oldt);
50	xset1(&tio0);	33	t = oldt;
51	xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);	34	cfmakeraw(t);
52	// alarmed? -> exit 0	35	}
53	exit(SIGALRM == signo);	36
		37	static void xset1(struct termios *t)
		38	{
		39	int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t);
		40	if (ret) {
		41	bb_perror_msg("can't tcsetattr for stdin");
		42	}
54	}	43	}
55		44
56	int showkey_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	45	int showkey_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -62,20 +51,21 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
62	OPT_s = (1<<2), // display only the raw scan-codes	51	OPT_s = (1<<2), // display only the raw scan-codes
63	};	52	};
64		53
		54	INIT_G();
		55
65	// FIXME: aks are all mutually exclusive	56	// FIXME: aks are all mutually exclusive
66	getopt32(argv, "aks");	57	getopt32(argv, "aks");
67		58
68	INIT_G();
69
70	// get keyboard settings	59	// get keyboard settings
71	xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);	60	xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
72	printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",	61	printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",
73	kbmode == K_RAW ? "RAW" :	62	kbmode == K_RAW ? "RAW" :
74	(kbmode == K_XLATE ? "XLATE" :	63	(kbmode == K_XLATE ? "XLATE" :
75	(kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :	64	(kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
76	(kbmode == K_UNICODE ? "UNICODE" : "?UNKNOWN?")))	65	(kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
77	, (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress"	66	, (option_mask32 & OPT_a) ? "on EOF (ctrl-D)" : "10s after last keypress"
78	);	67	);
		68
79	// prepare for raw mode	69	// prepare for raw mode
80	xget1(&tio, &tio0);	70	xget1(&tio, &tio0);
81	// put stdin in raw mode	71	// put stdin in raw mode
@@ -83,34 +73,37 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
83		73
84	if (option_mask32 & OPT_a) {	74	if (option_mask32 & OPT_a) {
85	unsigned char c;	75	unsigned char c;
		76
86	// just read stdin char by char	77	// just read stdin char by char
87	while (1 == safe_read(STDIN_FILENO, &c, 1)) {	78	while (1 == read(STDIN_FILENO, &c, 1)) {
88	printf("%3u 0%03o 0x%02x\r\n", c, c, c);	79	printf("%3u 0%03o 0x%02x\r\n", c, c, c);
89	if (04 /CTRL-D/ == c)	80	if (04 /CTRL-D/ == c)
90	break;	81	break;
91	}	82	}
92	} else {	83	} else {
93	// we should exit on any signal
94	bb_signals(BB_FATAL_SIGS, signal_handler);
95	// set raw keyboard mode	84	// set raw keyboard mode
96	xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));	85	xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
97		86
		87	// we should exit on any signal; signals should interrupt read
		88	bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
		89
98	// read and show scancodes	90	// read and show scancodes
99	while (1) {	91	while (!bb_got_signal) {
100	char buf[18];	92	char buf[18];
101	int i, n;	93	int i, n;
		94
102	// setup 10s watchdog	95	// setup 10s watchdog
103	alarm(10);	96	alarm(10);
104	// read scancodes	97	// read scancodes
105	n = read(STDIN_FILENO, buf, sizeof(buf));	98	n = read(STDIN_FILENO, buf, sizeof(buf));
106	i = 0;	99	i = 0;
107	while (i < n) {	100	while (i < n) {
108	char c = buf[i];
109	// show raw scancodes ordered? ->
110	if (option_mask32 & OPT_s) {	101	if (option_mask32 & OPT_s) {
		102	// show raw scancodes
111	printf("0x%02x ", buf[i++]);	103	printf("0x%02x ", buf[i++]);
112	// show interpreted scancodes (default) ? ->
113	} else {	104	} else {
		105	// show interpreted scancodes (default)
		106	char c = buf[i];
114	int kc;	107	int kc;
115	if (i+2 < n	108	if (i+2 < n
116	&& (c & 0x7f) == 0	109	&& (c & 0x7f) == 0
@@ -130,9 +123,9 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
130	}	123	}
131	}	124	}
132		125
133	// cleanup	126	// restore keyboard and console settings
134	signal_handler(SIGALRM);	127	xset1(&tio0);
		128	xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
135		129
136	// should never be here!
137	return EXIT_SUCCESS;	130	return EXIT_SUCCESS;
138	}	131	}