 @@ -1,14 +1,14 @@
-/*	$NetBSD: read.c,v 1.61 2011/07/09 23:54:39 christos Exp $	*/
+/*	$NetBSD: read.c,v 1.62 2011/07/28 00:44:35 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: read.c,v 1.61 2011/07/09 23:54:39 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.62 2011/07/28 00:44:35 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * read.c: Clean this junk up! This is horrible code.
  *	   Terminal read functions
  */
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <limits.h>
 #include "el.h"
 @@ -217,28 +217,28 @@ read_preread(EditLine *el)
  *	Push a macro
  */
 public void
 FUN(el,push)(EditLine *el, const Char *str)
+{
 	c_macro_t *ma = &el->el_chared.c_macro;
 	if (str != NULL && ma->level + 1 < EL_MAXMACRO) {
 		ma->level++;
 		if ((ma->macro[ma->level] = Strdup(str)) != NULL)
 			return;
 		ma->level--;
+	}
-	term_beep(el);
+	terminal_beep(el);
-	term__flush(el);
+	terminal__flush(el);
+}
 /* read_getcmd():
  *	Return next command from the input stream.
  *	Character values > 255 are not looked up in the map, but inserted.
  */
 private int
 read_getcmd(EditLine *el, el_action_t *cmdnum, Char *ch)
+{
 	el_action_t cmd;
 	int num;
 @@ -313,27 +313,27 @@ private int
 read_char(EditLine *el, Char *cp)
+{
 	ssize_t num_read;
 	int tried = 0;
         char cbuf[MB_LEN_MAX];
         int cbp = 0;
         int bytes = 0;
  again:
 	el->el_signal->sig_no = 0;
 	while ((num_read = read(el->el_infd, cbuf + cbp, 1)) == -1) {
 		switch (el->el_signal->sig_no) {
 		case SIGCONT:
-			el_set(el, EL_REFRESH);
+			FUN(el,set)(el, EL_REFRESH);
 			/*FALLTHROUGH*/
 		case SIGWINCH:
 			sig_set(el);
 			goto again;
 		default:
 			break;
+		}
 		if (!tried && read__fixio(el->el_infd, errno) == 0)
 			tried = 1;
 		else {
 			*cp = '\0';
 			return (-1);
+		}
 @@ -382,27 +382,27 @@ read_pop(c_macro_t *ma)
 	ma->level--;
 	ma->offset = 0;
+}
 /* el_getc():
  *	Read a character
  */
 public int
 FUN(el,getc)(EditLine *el, Char *cp)
+{
 	int num_read;
 	c_macro_t *ma = &el->el_chared.c_macro;
-	term__flush(el);
+	terminal__flush(el);
 	for (;;) {
 		if (ma->level < 0) {
 			if (!read_preread(el))
 				break;
+		}
 		if (ma->level < 0)
 			break;
 		if (ma->macro[0][ma->offset] == '\0') {
 			read_pop(ma);
 			continue;
+		}
 @@ -445,27 +445,27 @@ read_prepare(EditLine *el)
 	if (el->el_flags & NO_TTY)
 		return;
 	if ((el->el_flags & (UNBUFFERED|EDIT_DISABLED)) == UNBUFFERED)
 		tty_rawmode(el);
 	/* This is relatively cheap, and things go terribly wrong if
 	   we have the wrong size. */
 	el_resize(el);
 	re_clear_display(el);	/* reset the display stuff */
 	ch_reset(el, 0);
 	re_refresh(el);		/* print the prompt */
 	if (el->el_flags & UNBUFFERED)
-		term__flush(el);
+		terminal__flush(el);
+}
 protected void
 read_finish(EditLine *el)
+{
 	if ((el->el_flags & UNBUFFERED) == 0)
 		(void) tty_cookedmode(el);
 	if (el->el_flags & HANDLE_SIGNALS)
 		sig_clr(el);
+}
 public const Char *
 FUN(el,gets)(EditLine *el, int *nread)
 @@ -528,27 +528,27 @@ FUN(el,gets)(EditLine *el, int *nread)
 #endif /* FIONREAD */
 	if ((el->el_flags & UNBUFFERED) == 0)
 		read_prepare(el);
 	if (el->el_flags & EDIT_DISABLED) {
 		size_t idx;
 		if ((el->el_flags & UNBUFFERED) == 0)
 			cp = el->el_line.buffer;
 		else
 			cp = el->el_line.lastchar;
-		term__flush(el);
+		terminal__flush(el);
 		while ((num = (*el->el_read.read_char)(el, cp)) == 1) {
 			/* make sure there is space next character */
 			if (cp + 1 >= el->el_line.limit) {
 				idx = (cp - el->el_line.buffer);
 				if (!ch_enlargebufs(el, 2))
 					break;
 				cp = &el->el_line.buffer[idx];
+			}
 			cp++;
 			crlf = cp[-1] == '\r' || cp[-1] == '\n';
 			if (el->el_flags & UNBUFFERED)
 				break;
 @@ -635,27 +635,27 @@ FUN(el,gets)(EditLine *el, int *nread)
 			break;
 		case CC_REDISPLAY:
 			re_clear_lines(el);
 			re_clear_display(el);
 			/* FALLTHROUGH */
 		case CC_REFRESH:
 			re_refresh(el);
 			break;
 		case CC_REFRESH_BEEP:
 			re_refresh(el);
-			term_beep(el);
+			terminal_beep(el);
 			break;
 		case CC_NORM:	/* normal char */
 			break;
 		case CC_ARGHACK:	/* Suggested by Rich Salz */
 			/* <rsalz@pineapple.bbn.com> */
 			continue;	/* keep going... */
 		case CC_EOF:	/* end of file typed */
 			if ((el->el_flags & UNBUFFERED) == 0)
 				num = 0;
 			else if (num == -1) {
 @@ -676,38 +676,38 @@ FUN(el,gets)(EditLine *el, int *nread)
 #endif /* DEBUG_READ */
 			/* put (real) cursor in a known place */
 			re_clear_display(el);	/* reset the display stuff */
 			ch_reset(el, 1);	/* reset the input pointers */
 			re_refresh(el);	/* print the prompt again */
 			break;
 		case CC_ERROR:
 		default:	/* functions we don't know about */
 #ifdef DEBUG_READ
 			(void) fprintf(el->el_errfile,
 			    "*** editor ERROR ***\r\n\n");
 #endif /* DEBUG_READ */
-			term_beep(el);
+			terminal_beep(el);
-			term__flush(el);
+			terminal__flush(el);
 			break;
+		}
 		el->el_state.argument = 1;
 		el->el_state.doingarg = 0;
 		el->el_chared.c_vcmd.action = NOP;
 		if (el->el_flags & UNBUFFERED)
 			break;
+	}
-	term__flush(el);		/* flush any buffered output */
+	terminal__flush(el);		/* flush any buffered output */
 	/* make sure the tty is set up correctly */
 	if ((el->el_flags & UNBUFFERED) == 0) {
 		read_finish(el);
 		*nread = num != -1 ? num : 0;
 	} else {
 		*nread = (int)(el->el_line.lastchar - el->el_line.buffer);
+	}
 	goto done;
 noedit:
 	el->el_line.cursor = el->el_line.lastchar = cp;
 	*cp = '\0';
 	*nread = (int)(el->el_line.cursor - el->el_line.buffer);
 done: