diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-06-29 23:40:54 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-06-29 23:40:54 +0000 |
| commit | 3e4f4b93f7d647dd203b0057e2d02aa2d523b3a5 (patch) | |
| tree | 726b35055d01abe036a817850f37a627dab42db1 /lib/libedit/read.c | |
| parent | 73e3215c3918f21ebe935bf879071e6dbf6c842a (diff) | |
Updates from NetBSD (christos@netbsd.org)
* Portability fixes:
__const -> const
BADSIG -> SIG_ERR
int flags -> u_int flags
#if __STDC__ -> #ifdef __STDC__
* Don't allow CSWTCH to interfere with CSUSP on __SVR4 systems.
* Return -1 if the terminal set operation resulted in dumb terminal settings.
* Handle properly the case where the last line in the sourced file does
not have a trailing '\n'. From Jeffrey C Honig.
* editrc -> editline in editline(3)
Diffstat (limited to 'lib/libedit/read.c')
| -rw-r--r-- | lib/libedit/read.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/libedit/read.c b/lib/libedit/read.c index 5bfe0f7bb91..8061be9780b 100644 --- a/lib/libedit/read.c +++ b/lib/libedit/read.c @@ -1,5 +1,5 @@ -/* $OpenBSD: read.c,v 1.4 1997/06/10 20:10:13 millert Exp $ */ -/* $NetBSD: read.c,v 1.3 1997/01/14 04:17:25 lukem Exp $ */ +/* $OpenBSD: read.c,v 1.5 1997/06/29 23:40:50 millert Exp $ */ +/* $NetBSD: read.c,v 1.4 1997/04/11 17:52:47 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: read.c,v 1.4 1997/06/10 20:10:13 millert Exp $"; +static char rcsid[] = "$OpenBSD: read.c,v 1.5 1997/06/29 23:40:50 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -93,13 +93,17 @@ read__fixio(fd, e) #ifdef EWOULDBLOCK case EWOULDBLOCK: -# define TRY_AGAIN +# ifndef TRY_AGAIN +# define TRY_AGAIN +# endif #endif /* EWOULDBLOCK */ #if defined(POSIX) && defined(EAGAIN) # if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN case EAGAIN: -# define TRY_AGAIN +# ifndef TRY_AGAIN +# define TRY_AGAIN +# endif # endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */ #endif /* POSIX && EAGAIN */ |