From ea0d3f8feef5d5dccadf4649dcda2769dc1ad173 Mon Sep 17 00:00:00 2001 From: pfg Date: Wed, 11 Jul 2012 22:20:19 +0000 Subject: Re-merge a couple of changes from NetBSD's libedit. bin/sh has been taught about el_gets setting the count to -1 on error, so now we can partially revert r238173 to reduce differences with NetBSD's implementation. Unfortunately NetBSD's libedit handling of EINTR (Revision 1.44 in read.c + SIGWINCH fixes) still causes trouble in bin/sh and other utilities and has to be avoided. MFC after: 1 month --- lib/libedit/sig.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/libedit/sig.h') diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h index 8773ddc..7e38100 100644 --- a/lib/libedit/sig.h +++ b/lib/libedit/sig.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sig.h 8.1 (Berkeley) 6/4/93 - * $NetBSD: sig.h,v 1.7 2009/02/15 21:25:01 christos Exp $ + * $NetBSD: sig.h,v 1.8 2009/02/19 15:20:22 christos Exp $ * $FreeBSD$ */ @@ -61,6 +61,7 @@ typedef struct { struct sigaction sig_action[ALLSIGSNO]; sigset_t sig_set; + volatile sig_atomic_t sig_no; } *el_signal_t; protected void sig_end(EditLine*); -- cgit v1.1