msh: also handle EOF/read errors correctly

This commit is contained in:
Denis Vlasenko 2008-02-02 18:50:50 +00:00
parent 80667e30fb
commit 6e602c4931

View File

@ -4836,11 +4836,11 @@ static int filechar(struct ioarg *ap)
static int position = 0, size = 0; static int position = 0, size = 0;
while (size == 0 || position >= size) { while (size == 0 || position >= size) {
/* Repeat if Ctrl-C is pressed. TODO: exit on -1 (error/EOF)? */ size = read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state);
while (read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state) == 0) if (size < 0) /* Error/EOF */
continue; exit(0);
size = strlen(filechar_cmdbuf);
position = 0; position = 0;
/* if Ctrl-C, size == 0 and loop will repeat */
} }
c = filechar_cmdbuf[position]; c = filechar_cmdbuf[position];
position++; position++;