From 6e602c49316bf75376467c1aeb194741e85421d4 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sat, 2 Feb 2008 18:50:50 +0000
Subject: msh: also handle EOF/read errors correctly

---
 shell/msh.c | 8 ++++----
 1 file 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++;
-- 
cgit v1.1