diff options
author | Denis Vlasenko | 2008-02-02 18:50:50 +0000 |
---|---|---|
committer | Denis Vlasenko | 2008-02-02 18:50:50 +0000 |
commit | 6e602c49316bf75376467c1aeb194741e85421d4 (patch) | |
tree | 00bee3c815d822b3a3706331504458c3c3aade04 | |
parent | 80667e30fbd3feb95a0af4bca0f512694a438bde (diff) | |
download | busybox-6e602c49316bf75376467c1aeb194741e85421d4.zip busybox-6e602c49316bf75376467c1aeb194741e85421d4.tar.gz |
msh: also handle EOF/read errors correctly
-rw-r--r-- | shell/msh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/msh.c b/shell/msh.c index 9a1be36..531ae77 100644 --- a/shell/msh.c +++ b/shell/msh.c @@ -4836,11 +4836,11 @@ static int filechar(struct ioarg *ap) static int position = 0, size = 0; while (size == 0 || position >= size) { - /* Repeat if Ctrl-C is pressed. TODO: exit on -1 (error/EOF)? */ - while (read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state) == 0) - continue; - size = strlen(filechar_cmdbuf); + size = read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state); + if (size < 0) /* Error/EOF */ + exit(0); position = 0; + /* if Ctrl-C, size == 0 and loop will repeat */ } c = filechar_cmdbuf[position]; position++; |