From b79d8a6a32f0c72c9a2ad151e469b29696c8bd0e Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Tue, 21 Aug 2012 21:46:01 +0000 Subject: MFC r238377: Merge libedit adjustment from NetBSD. On recent versions of NetBSD's libedit, el_gets now sets el_len to -1 on error so we can distinguish between a NULL string and an error. This fixes sh from exiting with newer versions of libedit now allowing EINTR to return. Obtained from: NetBSD Reviewed by: jilles MFC after: 3 weeks --- bin/sh/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/sh/input.c b/bin/sh/input.c index 671bbdf38e91..6db061963ff2 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -186,7 +186,7 @@ retry: if (rl_cp == NULL) rl_cp = el_gets(el, &el_len); if (rl_cp == NULL) - nr = 0; + nr = el_len == 0 ? 0 : -1; else { nr = el_len; if (nr > BUFSIZ - 1) -- cgit v1.3