diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-08 05:07:02 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-08 05:07:02 +0100 |
| commit | 66c5b12dbf85142eea257ba6047191d7c0ee43f3 (patch) | |
| tree | 913ab2ca77d8a90bb48e75de12435d2776805da5 /editors | |
| parent | dd807c16f99b4ead544289b83c88cc2488542f72 (diff) | |
| download | busybox-w32-66c5b12dbf85142eea257ba6047191d7c0ee43f3.tar.gz busybox-w32-66c5b12dbf85142eea257ba6047191d7c0ee43f3.tar.bz2 busybox-w32-66c5b12dbf85142eea257ba6047191d7c0ee43f3.zip | |
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>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/ed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editors/ed.c b/editors/ed.c index 859668406..b1b6a8d27 100644 --- a/editors/ed.c +++ b/editors/ed.c | |||
| @@ -129,7 +129,7 @@ static void doCommands(void) | |||
| 129 | * 0 on ctrl-C, | 129 | * 0 on ctrl-C, |
| 130 | * >0 length of input string, including terminating '\n' | 130 | * >0 length of input string, including terminating '\n' |
| 131 | */ | 131 | */ |
| 132 | len = read_line_input(": ", buf, sizeof(buf), NULL); | 132 | len = read_line_input(NULL, ": ", buf, sizeof(buf), /*timeout*/ -1); |
| 133 | if (len <= 0) | 133 | if (len <= 0) |
| 134 | return; | 134 | return; |
| 135 | endbuf = &buf[len - 1]; | 135 | endbuf = &buf[len - 1]; |
| @@ -227,7 +227,7 @@ static void doCommands(void) | |||
| 227 | } | 227 | } |
| 228 | if (!dirty) | 228 | if (!dirty) |
| 229 | return; | 229 | return; |
| 230 | len = read_line_input("Really quit? ", buf, 16, NULL); | 230 | len = read_line_input(NULL, "Really quit? ", buf, 16, /*timeout*/ -1); |
| 231 | /* read error/EOF - no way to continue */ | 231 | /* read error/EOF - no way to continue */ |
| 232 | if (len < 0) | 232 | if (len < 0) |
| 233 | return; | 233 | return; |
| @@ -541,7 +541,7 @@ static void addLines(int num) | |||
| 541 | * 0 on ctrl-C, | 541 | * 0 on ctrl-C, |
| 542 | * >0 length of input string, including terminating '\n' | 542 | * >0 length of input string, including terminating '\n' |
| 543 | */ | 543 | */ |
| 544 | len = read_line_input("", buf, sizeof(buf), NULL); | 544 | len = read_line_input(NULL, "", buf, sizeof(buf), /*timeout*/ -1); |
| 545 | if (len <= 0) { | 545 | if (len <= 0) { |
| 546 | /* Previously, ctrl-C was exiting to shell. | 546 | /* Previously, ctrl-C was exiting to shell. |
| 547 | * Now we exit to ed prompt. Is in important? */ | 547 | * Now we exit to ed prompt. Is in important? */ |