From 5fb1ee3f97289074584bb6049f3126172b2e03be Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Tue, 6 Mar 2001 00:33:05 +0000
Subject: EINTR/EAGAIN handling is required in more cases

---
 usr.bin/ssh/cli.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'usr.bin/ssh/cli.c')

diff --git a/usr.bin/ssh/cli.c b/usr.bin/ssh/cli.c
index 620431e9bf2..8f0b2b87e36 100644
--- a/usr.bin/ssh/cli.c
+++ b/usr.bin/ssh/cli.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cli.c,v 1.10 2001/03/01 03:38:33 deraadt Exp $	*/
+/*	$OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cli.c,v 1.10 2001/03/01 03:38:33 deraadt Exp $");
+RCSID("$OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -136,12 +136,16 @@ cli_read(char* buf, int size, int echo)
 {
 	char ch = 0;
 	int i = 0;
+	int n;
 
 	if (!echo)
 		cli_echo_disable();
 
 	while (ch != '\n') {
-		if (read(cli_input, &ch, 1) != 1)
+		n = read(cli_input, &ch, 1);
+		if (n == -1 && (errno == EAGAIN || errno == EINTR))
+			continue;
+		if (n != 1)
 			break;
 		if (ch == '\n' || intr != 0)
 			break;
-- 
cgit v1.2.3