diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-20 18:30:38 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-20 18:30:38 +0000 |
| commit | 037576d77b62186551ad07b10eb46a73144b9f84 (patch) | |
| tree | e862c15849181373d5ea3a0820d75393d3054240 /libbb | |
| parent | 99014e89656594ce9beec06f2605f6f7126907b9 (diff) | |
| download | busybox-w32-037576d77b62186551ad07b10eb46a73144b9f84.tar.gz busybox-w32-037576d77b62186551ad07b10eb46a73144b9f84.tar.bz2 busybox-w32-037576d77b62186551ad07b10eb46a73144b9f84.zip | |
read_line_input: fix it to not do any fancy editing if echoing is disabled.
ash: make read handling both more correct and smaller
read_line_input 4037 4101 +64
input_backward 140 139 -1
readcmd 1079 1070 -9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 65/-10) Total: 54 bytes
text data bss dec hex filename
777575 1000 9532 788107 c068b busybox_old
777629 1000 9532 788161 c06c1 busybox_unstripped
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/lineedit.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index c44a22843..f65e852b1 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
| @@ -1259,7 +1259,7 @@ static void win_changed(int nsig) | |||
| 1259 | * 0 on ctrl-C, | 1259 | * 0 on ctrl-C, |
| 1260 | * >0 length of input string, including terminating '\n' | 1260 | * >0 length of input string, including terminating '\n' |
| 1261 | */ | 1261 | */ |
| 1262 | int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *st) | 1262 | int read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st) |
| 1263 | { | 1263 | { |
| 1264 | int lastWasTab = FALSE; | 1264 | int lastWasTab = FALSE; |
| 1265 | unsigned int ic; | 1265 | unsigned int ic; |
| @@ -1270,6 +1270,15 @@ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t | |||
| 1270 | smalluint prevc; | 1270 | smalluint prevc; |
| 1271 | #endif | 1271 | #endif |
| 1272 | 1272 | ||
| 1273 | getTermSettings(0, (void *) &initial_settings); | ||
| 1274 | /* Happens when e.g. stty -echo was run before */ | ||
| 1275 | if (!(initial_settings.c_lflag & ECHO)) { | ||
| 1276 | parse_prompt(prompt); | ||
| 1277 | fflush(stdout); | ||
| 1278 | fgets(command, maxsize, stdin); | ||
| 1279 | return strlen(command); | ||
| 1280 | } | ||
| 1281 | |||
| 1273 | // FIXME: audit & improve this | 1282 | // FIXME: audit & improve this |
| 1274 | if (maxsize > MAX_LINELEN) | 1283 | if (maxsize > MAX_LINELEN) |
| 1275 | maxsize = MAX_LINELEN; | 1284 | maxsize = MAX_LINELEN; |
| @@ -1287,7 +1296,6 @@ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t | |||
| 1287 | command_ps = command; | 1296 | command_ps = command; |
| 1288 | command[0] = '\0'; | 1297 | command[0] = '\0'; |
| 1289 | 1298 | ||
| 1290 | getTermSettings(0, (void *) &initial_settings); | ||
| 1291 | memcpy(&new_settings, &initial_settings, sizeof(new_settings)); | 1299 | memcpy(&new_settings, &initial_settings, sizeof(new_settings)); |
| 1292 | new_settings.c_lflag &= ~ICANON; /* unbuffered input */ | 1300 | new_settings.c_lflag &= ~ICANON; /* unbuffered input */ |
| 1293 | /* Turn off echoing and CTRL-C, so we can trap it */ | 1301 | /* Turn off echoing and CTRL-C, so we can trap it */ |