ash: fix TMOUT not restoring tty attributes
function old new delta pgetc 420 500 +80 readtoken1 3202 3239 +37 read_line_input 3316 3337 +21 udhcpc_main 2610 2630 +20 file_get 266 272 +6 expandarg 958 963 +5 localcmd 257 259 +2 addLines 85 87 +2 read_line 94 95 +1 ed_main 2540 2541 +1 timed_out 1 - -1 lineedit_read_key 256 255 -1 alrm_sighandler 44 - -44 cmdloop 539 434 -105 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 10/2 up/down: 175/-151) Total: 24 bytes text data bss dec hex filename 887379 936 17200 905515 dd12b busybox_old 887411 936 17192 905539 dd143 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
@@ -129,7 +129,7 @@ static void doCommands(void)
|
||||
* 0 on ctrl-C,
|
||||
* >0 length of input string, including terminating '\n'
|
||||
*/
|
||||
len = read_line_input(": ", buf, sizeof(buf), NULL);
|
||||
len = read_line_input(NULL, ": ", buf, sizeof(buf), /*timeout*/ -1);
|
||||
if (len <= 0)
|
||||
return;
|
||||
endbuf = &buf[len - 1];
|
||||
@@ -227,7 +227,7 @@ static void doCommands(void)
|
||||
}
|
||||
if (!dirty)
|
||||
return;
|
||||
len = read_line_input("Really quit? ", buf, 16, NULL);
|
||||
len = read_line_input(NULL, "Really quit? ", buf, 16, /*timeout*/ -1);
|
||||
/* read error/EOF - no way to continue */
|
||||
if (len < 0)
|
||||
return;
|
||||
@@ -541,7 +541,7 @@ static void addLines(int num)
|
||||
* 0 on ctrl-C,
|
||||
* >0 length of input string, including terminating '\n'
|
||||
*/
|
||||
len = read_line_input("", buf, sizeof(buf), NULL);
|
||||
len = read_line_input(NULL, "", buf, sizeof(buf), /*timeout*/ -1);
|
||||
if (len <= 0) {
|
||||
/* Previously, ctrl-C was exiting to shell.
|
||||
* Now we exit to ed prompt. Is in important? */
|
||||
|
Reference in New Issue
Block a user