 @@ -1,14 +1,14 @@
-/*	$NetBSD: el.c,v 1.63 2011/07/26 21:03:17 christos Exp $	*/
+/*	$NetBSD: el.c,v 1.64 2011/07/28 00:49:18 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[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #else
-__RCSID("$NetBSD: el.c,v 1.63 2011/07/26 21:03:17 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.64 2011/07/28 00:49:18 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * el.c: EditLine interface functions
  */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <locale.h>
 @@ -82,27 +82,27 @@ el_init(const char *prog, FILE *fin, FIL
+	}
 	/*
          * Initialize all the modules. Order is important!!!
          */
 	el->el_flags = 0;
 #ifdef WIDECHAR
 	if (setlocale(LC_CTYPE, NULL) != NULL){
 		if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0)
 			el->el_flags |= CHARSET_IS_UTF8;
+	}
 #endif
-	if (term_init(el) == -1) {
+	if (terminal_init(el) == -1) {
 		el_free(el->el_prog);
 		el_free(el);
 		return NULL;
+	}
 	(void) key_init(el);
 	(void) map_init(el);
 	if (tty_init(el) == -1)
 		el->el_flags |= NO_TTY;
 	(void) ch_init(el);
 	(void) search_init(el);
 	(void) hist_init(el);
 	(void) prompt_init(el);
 	(void) sig_init(el);
 @@ -114,27 +114,27 @@ el_init(const char *prog, FILE *fin, FIL
 /* el_end():
  *	Clean up.
  */
 public void
 el_end(EditLine *el)
+{
 	if (el == NULL)
 		return;
 	el_reset(el);
-	term_end(el);
+	terminal_end(el);
 	key_end(el);
 	map_end(el);
 	tty_end(el);
 	ch_end(el);
 	search_end(el);
 	hist_end(el);
 	prompt_end(el);
 	sig_end(el);
 	el_free((ptr_t) el->el_prog);
 #ifdef WIDECHAR
 	el_free((ptr_t) el->el_scratch.cbuff);
 	el_free((ptr_t) el->el_scratch.wbuff);
 @@ -186,27 +186,27 @@ FUN(el,set)(EditLine *el, int op, ...)
 		break;
+	}
 	case EL_PROMPT_ESC:
 	case EL_RPROMPT_ESC: {
 		el_pfunc_t p = va_arg(ap, el_pfunc_t);
 		int c = va_arg(ap, int);
 		rv = prompt_set(el, p, c, op, 1);
 		break;
+	}
 	case EL_TERMINAL:
-		rv = term_set(el, va_arg(ap, char *));
+		rv = terminal_set(el, va_arg(ap, char *));
 		break;
 	case EL_EDITOR:
 		rv = map_set_editor(el, va_arg(ap, Char *));
 		break;
 	case EL_SIGNAL:
 		if (va_arg(ap, int))
 			el->el_flags |= HANDLE_SIGNALS;
 		else
 			el->el_flags &= ~HANDLE_SIGNALS;
 		break;
 @@ -221,37 +221,37 @@ FUN(el,set)(EditLine *el, int op, ...)
 		for (i = 1; i < 20; i++)
 			if ((argv[i] = va_arg(ap, Char *)) == NULL)
 				break;
 		switch (op) {
 		case EL_BIND:
 			argv[0] = STR("bind");
 			rv = map_bind(el, i, argv);
 			break;
 		case EL_TELLTC:
 			argv[0] = STR("telltc");
-			rv = term_telltc(el, i, argv);
+			rv = terminal_telltc(el, i, argv);
 			break;
 		case EL_SETTC:
 			argv[0] = STR("settc");
-			rv = term_settc(el, i, argv);
+			rv = terminal_settc(el, i, argv);
 			break;
 		case EL_ECHOTC:
 			argv[0] = STR("echotc");
-			rv = term_echotc(el, i, argv);
+			rv = terminal_echotc(el, i, argv);
 			break;
 		case EL_SETTY:
 			argv[0] = STR("setty");
 			rv = tty_stty(el, i, argv);
 			break;
 		default:
 			rv = -1;
 			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
 			break;
+		}
 		break;
 @@ -341,27 +341,27 @@ FUN(el,set)(EditLine *el, int op, ...)
 			el->el_errfile = fp;
 			el->el_errfd = fileno(fp);
 			break;
 		default:
 			rv = -1;
 			break;
+		}
 		break;
+	}
 	case EL_REFRESH:
 		re_clear_display(el);
 		re_refresh(el);
-		term__flush(el);
+		terminal__flush(el);
 		break;
 	default:
 		rv = -1;
 		break;
+	}
 	va_end(ap);
 	return (rv);
+}
 /* el_get():
 @@ -399,44 +399,44 @@ FUN(el,get)(EditLine *el, int op, ...)
 		break;
 	case EL_SIGNAL:
 		*va_arg(ap, int *) = (el->el_flags & HANDLE_SIGNALS);
 		rv = 0;
 		break;
 	case EL_EDITMODE:
 		*va_arg(ap, int *) = !(el->el_flags & EDIT_DISABLED);
 		rv = 0;
 		break;
 	case EL_TERMINAL:
-		term_get(el, va_arg(ap, const char **));
+		terminal_get(el, va_arg(ap, const char **));
 		rv = 0;
 		break;
 	case EL_GETTC:
+	{
 		static char name[] = "gettc";
 		char *argv[20];
 		int i;
  		for (i = 1; i < (int)(sizeof(argv) / sizeof(argv[0])); i++)
 			if ((argv[i] = va_arg(ap, char *)) == NULL)
 				break;
 		switch (op) {
 		case EL_GETTC:
 			argv[0] = name;
-			rv = term_gettc(el, i, argv);
+			rv = terminal_gettc(el, i, argv);
 			break;
 		default:
 			rv = -1;
 			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
 			break;
+		}
 		break;
+	}
 	case EL_GETCFN:
 		*va_arg(ap, el_rfunc_t *) = el_read_getfn(el);
 		rv = 0;
 @@ -496,113 +496,114 @@ FUN(el,line)(EditLine *el)
 	return (const TYPE(LineInfo) *) (void *) &el->el_line;
+}
 /* el_source():
  *	Source a file
  */
 public int
 el_source(EditLine *el, const char *fname)
+{
 	FILE *fp;
 	size_t len;
 	char *ptr;
-#ifdef HAVE_ISSETUGID
+	char *path = NULL;
 	char path[MAXPATHLEN];
 #endif
 	const Char *dptr;
 	int error = 0;
 	fp = NULL;
 	if (fname == NULL) {
 #ifdef HAVE_ISSETUGID
 		static const char elpath[] = "/.editrc";
 		size_t len = sizeof(elpath);
 		if (issetugid())
 			return (-1);
 		if ((ptr = getenv("HOME")) == NULL)
 			return (-1);
-		if (strlcpy(path, ptr, sizeof(path)) >= sizeof(path))
+		len += strlen(ptr);
-			return (-1);
+		if ((path = malloc(len)) == NULL)
 		if (strlcat(path, elpath, sizeof(path)) >= sizeof(path))
 			return (-1);
 		(void)snprintf(path, len, "%s%s", ptr, elpath);
 		fname = path;
 #else
 		/*
 		 * If issetugid() is missing, always return an error, in order
 		 * to keep from inadvertently opening up the user to a security
 		 * hole.
 		 */
 		return (-1);
 #endif
+	}
 	if (fp == NULL)
 		fp = fopen(fname, "r");
-	if (fp == NULL)
+	if (fp == NULL) {
 		el_free(path);
 		return (-1);
+	}
 	while ((ptr = fgetln(fp, &len)) != NULL) {
 		if (*ptr == '\n')
 			continue;	/* Empty line. */
 		dptr = ct_decode_string(ptr, &el->el_scratch);
 		if (!dptr)
 			continue;
 		if (len > 0 && dptr[len - 1] == '\n')
 			--len;
 		/* loop until first non-space char or EOL */
 		while (*dptr != '\0' && Isspace(*dptr))
 			dptr++;
 		if (*dptr == '#')
 			continue;   /* ignore, this is a comment line */
-		if (parse_line(el, dptr) == -1) {
+		if ((error = parse_line(el, dptr)) == -1)
-			(void) fclose(fp);
+			break;
 			return (-1);
+	}
 	el_free(path);
 	(void) fclose(fp);
-	return (0);
+	return (error);
+}
 /* el_resize():
  *	Called from program when terminal is resized
  */
 public void
 el_resize(EditLine *el)
+{
 	int lins, cols;
 	sigset_t oset, nset;
 	(void) sigemptyset(&nset);
 	(void) sigaddset(&nset, SIGWINCH);
 	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
 	/* get the correct window size */
-	if (term_get_size(el, &lins, &cols))
+	if (terminal_get_size(el, &lins, &cols))
-		term_change_size(el, lins, cols);
+		terminal_change_size(el, lins, cols);
 	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
+}
 /* el_beep():
  *	Called from the program to beep
  */
 public void
 el_beep(EditLine *el)
+{
-	term_beep(el);
+	terminal_beep(el);
+}
 /* el_editmode()
  *	Set the state of EDIT_DISABLED from the `edit' command.
  */
 protected int
 /*ARGSUSED*/
 el_editmode(EditLine *el, int argc, const Char **argv)
+{
 	const Char *how;
 	if (argv == NULL || argc != 2 || argv[1] == NULL)