 @@ -1,14 +1,14 @@
-/*	$NetBSD: chared.c,v 1.33 2011/07/29 15:20:39 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.34 2011/07/29 23:44:44 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[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: chared.c,v 1.33 2011/07/29 15:20:39 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.34 2011/07/29 23:44:44 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * chared.c: Character editor utilities
  */
 #include <stdlib.h>
 #include "el.h"
 private void ch__clearmacro (EditLine *);
 /* value to leave unused in line buffer */
 #define	EL_LEAVE	2
 @@ -681,27 +681,27 @@ c_gets(EditLine *el, Char *buf, const Ch
 				len = -1;
 				break;
+			}
 			cp--;
 			continue;
 		case 0033:	/* ESC */
 		case '\r':	/* Newline */
 		case '\n':
 			buf[len] = ch;
 			break;
 		default:
-			if (len >= EL_BUFSIZ - 16)
+			if (len >= (ssize_t)(EL_BUFSIZ - 16))
 				terminal_beep(el);
 			else {
 				buf[len++] = ch;
 				*cp++ = ch;
+			}
 			continue;
+		}
 		break;
+	}
 	el->el_line.buffer[0] = '\0';
 	el->el_line.lastchar = el->el_line.buffer;
 	el->el_line.cursor = el->el_line.buffer;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chartype.c,v 1.8 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: chartype.c,v 1.9 2011/07/29 23:44:44 christos Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,32 +28,32 @@
  * CONSEQUENTIAL 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.
  */
 /*
  * chartype.c: character classification and meta information
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.8 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.9 2011/07/29 23:44:44 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include "el.h"
 #include <stdlib.h>
-#define CT_BUFSIZ 1024
+#define CT_BUFSIZ ((size_t)1024)
 #ifdef WIDECHAR
 protected void
 ct_conv_buff_resize(ct_buffer_t *conv, size_t mincsize, size_t minwsize)
+{
 	void *p;
 	if (mincsize > conv->csize) {
 		conv->csize = mincsize;
 		p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff));
 		if (p == NULL) {
 			conv->csize = 0;
 			el_free(conv->cbuff);
 			conv->cbuff = NULL;
 @@ -73,88 +73,89 @@ ct_conv_buff_resize(ct_buffer_t *conv, s
+	}
+}
 public char *
 ct_encode_string(const Char *s, ct_buffer_t *conv)
+{
 	char *dst;
 	ssize_t used = 0;
 	if (!s)
 		return NULL;
 	if (!conv->cbuff)
-		ct_conv_buff_resize(conv, CT_BUFSIZ, 0);
+		ct_conv_buff_resize(conv, CT_BUFSIZ, (size_t)0);
 	if (!conv->cbuff)
 		return NULL;
 	dst = conv->cbuff;
 	while (*s) {
 		used = conv->csize - (dst - conv->cbuff);
 		if (used < 5) {
 			used = dst - conv->cbuff;
-			ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ, 0);
+			ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ,
 			    (size_t)0);
 			if (!conv->cbuff)
 				return NULL;
 			dst = conv->cbuff + used;
+		}
-		used = ct_encode_char(dst, 5, *s);
+		used = ct_encode_char(dst, (size_t)5, *s);
 		if (used == -1) /* failed to encode, need more buffer space */
 			abort();
 		++s;
 		dst += used;
+	}
 	*dst = '\0';
 	return conv->cbuff;
+}
 public Char *
 ct_decode_string(const char *s, ct_buffer_t *conv)
+{
 	size_t len = 0;
 	if (!s)
 		return NULL;
 	if (!conv->wbuff)
-		ct_conv_buff_resize(conv, 0, CT_BUFSIZ);
+		ct_conv_buff_resize(conv, (size_t)0, CT_BUFSIZ);
 	if (!conv->wbuff)
 		return NULL;
-	len = ct_mbstowcs(NULL, s, 0);
+	len = ct_mbstowcs(NULL, s, (size_t)0);
 	if (len == (size_t)-1)
 		return NULL;
 	if (len > conv->wsize)
-		ct_conv_buff_resize(conv, 0, len + 1);
+		ct_conv_buff_resize(conv, (size_t)0, len + 1);
 	if (!conv->wbuff)
 		return NULL;
 	ct_mbstowcs(conv->wbuff, s, conv->wsize);
 	return conv->wbuff;
+}
 protected Char **
 ct_decode_argv(int argc, const char *argv[], ct_buffer_t *conv)
+{
 	size_t bufspace;
 	int i;
 	Char *p;
 	Char **wargv;
 	ssize_t bytes;
 	/* Make sure we have enough space in the conversion buffer to store all
 	 * the argv strings. */
 	for (i = 0, bufspace = 0; i < argc; ++i)
 		bufspace += argv[i] ? strlen(argv[i]) + 1 : 0;
-	ct_conv_buff_resize(conv, 0, bufspace);
+	ct_conv_buff_resize(conv, (size_t)0, bufspace);
 	if (!conv->wsize)
 		return NULL;
 	wargv = el_malloc(argc * sizeof(*wargv));
 	for (i = 0, p = conv->wbuff; i < argc; ++i) {
 		if (!argv[i]) {   /* don't pass null pointers to mbstowcs */
 			wargv[i] = NULL;
 			continue;
 		} else {
 			wargv[i] = p;
 			bytes = mbstowcs(p, argv[i], bufspace);
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chartype.h,v 1.7 2010/12/16 17:42:28 wiz Exp $	*/
+/*	$NetBSD: chartype.h,v 1.8 2011/07/29 23:44:44 christos Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -51,27 +51,27 @@
  * funky encoding that could break us in weird and wonderful ways. */
 	#error wchar_t must store ISO 10646 characters
 #endif
 #endif
 /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
  * ref: ISO/IEC DTR 19769
  */
 #if WCHAR_MAX < INT32_MAX
 #warning Build environment does not support non-BMP characters
 #endif
 #define ct_mbtowc            mbtowc
-#define ct_mbtowc_reset      mbtowc(0,0,0)
+#define ct_mbtowc_reset      mbtowc(0,0,(size_t)0)
 #define ct_wctomb            wctomb
 #define ct_wctomb_reset      wctomb(0,0)
 #define ct_wcstombs          wcstombs
 #define ct_mbstowcs          mbstowcs
 #define Char			wchar_t
 #define Int			wint_t
 #define FUN(prefix,rest)	prefix ## _w ## rest
 #define FUNW(type)		type ## _w
 #define TYPE(type)		type ## W
 #define FSTR			"%ls"
 #define STR(x) 			L ## x
 #define UC(c)			c
 @@ -196,27 +196,27 @@ protected size_t ct_enc_width(Char);
 #define ct_decode_argv(l, s, b)	(s)
 #define ct_conv_buff_resize(b, os, ns)
 #define ct_encode_char(d, l, s)	(*d = s, 1)
 #define ct_free_argv(s)
 #endif
 #ifndef NARROWCHAR
 /* Encode a characted into the destination buffer, provided there is sufficent
  * buffer space available. Returns the number of bytes used up (zero if the
  * character cannot be encoded, -1 if there was not enough space available). */
 /* The maximum buffer size to hold the most unwieldly visual representation,
  * in this case \U+nnnnn. */
-#define VISUAL_WIDTH_MAX 8
+#define VISUAL_WIDTH_MAX ((size_t)8)
 /* The terminal is thought of in terms of X columns by Y lines. In the cases
  * where a wide character takes up more than one column, the adjacent
  * occupied column entries will contain this faux character. */
 #define MB_FILL_CHAR ((Char)-1)
 /* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn
  * style visual expansions. */
 protected int ct_visual_width(Char);
 /* Turn the given character into the appropriate visual format, matching
  * the width given by ct_visual_width(). Returns the number of characters used
  * up, or -1 if insufficient space. Buffer length is in count of Char's. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: filecomplete.c,v 1.28 2011/07/29 20:58:07 christos Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.29 2011/07/29 23:44:44 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL 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)
-__RCSID("$NetBSD: filecomplete.c,v 1.28 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.29 2011/07/29 23:44:44 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <string.h>
 #include <pwd.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 @@ -562,16 +562,16 @@ fn_complete(EditLine *el,
+	}
 	el_free(temp);
 	return retval;
+}
 /*
  * el-compatible wrapper around rl_complete; needed for key binding
  */
 /* ARGSUSED */
 unsigned char
 _el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
+{
 	return (unsigned char)fn_complete(el, NULL, NULL,
-	    break_chars, NULL, NULL, 100,
+	    break_chars, NULL, NULL, (size_t)100,
 	    NULL, NULL, NULL, NULL);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: history.c,v 1.44 2011/07/29 20:58:07 christos Exp $	*/
+/*	$NetBSD: history.c,v 1.45 2011/07/29 23:44:44 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[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: history.c,v 1.44 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.45 2011/07/29 23:44:44 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * hist.c: TYPE(History) access functions
  */
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <vis.h>
 #include <sys/stat.h>
 static const char hist_cookie[] = "_HiStOrY_V2_\n";
 @@ -750,27 +750,27 @@ history_load(TYPE(History) *h, const cha
 	ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
 	if (ptr == NULL)
 		goto done;
 	for (i = 0; (line = fgetln(fp, &sz)) != NULL; i++) {
 		char c = line[sz];
 		if (sz != 0 && line[sz - 1] == '\n')
 			line[--sz] = '\0';
 		else
 			line[sz] = '\0';
 		if (max_size < sz) {
 			char *nptr;
-			max_size = (sz + 1024) & ~1023;
+			max_size = (sz + 1024) & (size_t)~1023;
 			nptr = h_realloc(ptr, max_size * sizeof(*ptr));
 			if (nptr == NULL) {
 				i = -1;
 				goto oomem;
+			}
 			ptr = nptr;
+		}
 		(void) strunvis(ptr, line);
 		line[sz] = c;
 		if (HENTER(h, &ev, ct_decode_string(ptr, &conv)) == -1) {
 			i = -1;
 			goto oomem;
+		}
 @@ -806,27 +806,27 @@ history_save(TYPE(History) *h, const cha
 		goto done;
 	if (fputs(hist_cookie, fp) == EOF)
 		goto done;
 	ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
 	if (ptr == NULL)
 		goto done;
 	for (i = 0, retval = HLAST(h, &ev);
 	    retval != -1;
 	    retval = HPREV(h, &ev), i++) {
 		str = ct_encode_string(ev.str, &conv);
 		len = strlen(str) * 4;
 		if (len >= max_size) {
 			char *nptr;
-			max_size = (len + 1024) & ~1023;
+			max_size = (len + 1024) & (size_t)~1023;
 			nptr = h_realloc(ptr, max_size * sizeof(*ptr));
 			if (nptr == NULL) {
 				i = -1;
 				goto oomem;
+			}
 			ptr = nptr;
+		}
 		(void) strvis(ptr, str, VIS_WHITE);
 		(void) fprintf(fp, "%s\n", ptr);
+	}
 oomem:
 	h_free(ptr);
 done:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: keymacro.c,v 1.5 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: keymacro.c,v 1.6 2011/07/29 23:44:44 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[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: keymacro.c,v 1.5 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.6 2011/07/29 23:44:44 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * keymacro.c: This module contains the procedures for maintaining
  *	       the extended-key map.
+ *
  *      An extended-key (key) is a sequence of keystrokes introduced
  *	with a sequence introducer and consisting of an arbitrary
  *	number of characters.  This module maintains a map (the
  *	el->el_keymacro.map)
  *	to convert these extended-key sequences into input strs
  *	(XK_STR), editor functions (XK_CMD), or unix commands (XK_EXE).
 @@ -255,27 +255,27 @@ keymacro_delete(EditLine *el, const Char
 /* keymacro_print():
  *	Print the binding associated with key key.
  *	Print entire el->el_keymacro.map if null
  */
 protected void
 keymacro_print(EditLine *el, const Char *key)
+{
 	/* do nothing if el->el_keymacro.map is empty and null key specified */
 	if (el->el_keymacro.map == NULL && *key == 0)
 		return;
 	el->el_keymacro.buf[0] = '"';
-	if (node_lookup(el, key, el->el_keymacro.map, 1) <= -1)
+	if (node_lookup(el, key, el->el_keymacro.map, (size_t)1) <= -1)
 		/* key is not bound */
 		(void) fprintf(el->el_errfile, "Unbound extended key \"" FSTR
 		    "\"\n", key);
 	return;
+}
 /* node_trav():
  *	recursively traverses node in tree until match or mismatch is
  * 	found.  May read in more characters.
  */
 private int
 node_trav(EditLine *el, keymacro_node_t *ptr, Char *ch, keymacro_value_t *val)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: read.c,v 1.65 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: read.c,v 1.66 2011/07/29 23:44:44 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,42 +27,42 @@
  * 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.65 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.66 2011/07/29 23:44:44 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"
-#define	OKCMD	-1	/* must be -1! */
+#define OKCMD	-1	/* must be -1! */
 private int	read__fixio(int, int);
 private int	read_preread(EditLine *);
 private int	read_char(EditLine *, Char *);
 private int	read_getcmd(EditLine *, el_action_t *, Char *);
 private void	read_pop(c_macro_t *);
 /* read_init():
  *	Initialize the read stuff
  */
 protected int
 read_init(EditLine *el)
+{
 @@ -123,35 +123,35 @@ read_debug(EditLine *el)
  *	Try to recover from a read error
  */
 /* ARGSUSED */
 private int
 read__fixio(int fd __attribute__((__unused__)), int e)
+{
 	switch (e) {
 	case -1:		/* Make sure that the code is reachable */
 #ifdef EWOULDBLOCK
 	case EWOULDBLOCK:
 #ifndef TRY_AGAIN
-#define	TRY_AGAIN
+#define TRY_AGAIN
 #endif
 #endif /* EWOULDBLOCK */
 #if defined(POSIX) && defined(EAGAIN)
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	case EAGAIN:
 #ifndef TRY_AGAIN
-#define	TRY_AGAIN
+#define TRY_AGAIN
 #endif
 #endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */
 #endif /* POSIX && EAGAIN */
 		e = 0;
 #ifdef TRY_AGAIN
 #if defined(F_SETFL) && defined(O_NDELAY)
 		if ((e = fcntl(fd, F_GETFL, 0)) == -1)
 			return -1;
 		if (fcntl(fd, F_SETFL, e & ~O_NDELAY) == -1)
 			return -1;
 		else
 @@ -252,31 +252,31 @@ read_getcmd(EditLine *el, el_action_t *c
 #ifdef	KANJI
 		if ((*ch & 0200)) {
 			el->el_state.metanext = 0;
 			cmd = CcViMap[' '];
 			break;
 		} else
 #endif /* KANJI */
 		if (el->el_state.metanext) {
 			el->el_state.metanext = 0;
 			*ch |= 0200;
+		}
 #ifdef WIDECHAR
-                if (*ch >= N_KEYS)
+		if (*ch >= N_KEYS)
-                        cmd = ED_INSERT;
+			cmd = ED_INSERT;
 		else
 #endif
-                        cmd = el->el_map.current[(unsigned char) *ch];
+			cmd = el->el_map.current[(unsigned char) *ch];
 		if (cmd == ED_SEQUENCE_LEAD_IN) {
 			keymacro_value_t val;
 			switch (keymacro_get(el, ch, &val)) {
 			case XK_CMD:
 				cmd = val.cmd;
 				break;
 			case XK_STR:
 				FUN(el,push)(el, val.str);
 				break;
 #ifdef notyet
 			case XK_EXE:
 				/* XXX: In the future to run a user function */
 				RunCommand(val.str);
 @@ -286,51 +286,51 @@ read_getcmd(EditLine *el, el_action_t *c
 				EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
 				break;
+			}
+		}
 		if (el->el_map.alt == NULL)
 			el->el_map.current = el->el_map.key;
 	} while (cmd == ED_SEQUENCE_LEAD_IN);
 	*cmdnum = cmd;
 	return OKCMD;
+}
 #ifdef WIDECHAR
 /* utf8_islead():
- *      Test whether a byte is a leading byte of a UTF-8 sequence.
+ *	Test whether a byte is a leading byte of a UTF-8 sequence.
  */
 private int
-utf8_islead(unsigned char c)
+utf8_islead(int c)
+{
-        return c < 0x80 ||             /* single byte char */
+	return c < 0x80 ||	       /* single byte char */
-               (c >= 0xc2 && c <= 0xf4); /* start of multibyte sequence */
+	       (c >= 0xc2 && c <= 0xf4); /* start of multibyte sequence */
+}
 #endif
 /* read_char():
  *	Read a character from the tty.
  */
 private int
 read_char(EditLine *el, Char *cp)
+{
 	ssize_t num_read;
 	int tried = 0;
-        char cbuf[MB_LEN_MAX];
+	char cbuf[MB_LEN_MAX];
-        int cbp = 0;
+	size_t cbp = 0;
-        int bytes = 0;
+	int bytes = 0;
  again:
 	el->el_signal->sig_no = 0;
-	while ((num_read = read(el->el_infd, cbuf + cbp, 1)) == -1) {
+	while ((num_read = read(el->el_infd, cbuf + cbp, (size_t)1)) == -1) {
 		switch (el->el_signal->sig_no) {
 		case SIGCONT:
 			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 {
 @@ -482,27 +482,27 @@ FUN(el,gets)(EditLine *el, int *nread)
 	if (nread == NULL)
 		nread = &nrb;
 	*nread = 0;
 	if (el->el_flags & NO_TTY) {
 		size_t idx;
 		cp = el->el_line.buffer;
 		while ((num = (*el->el_read.read_char)(el, cp)) == 1) {
 			/* make sure there is space for next character */
 			if (cp + 1 >= el->el_line.limit) {
 				idx = (cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, 2))
+				if (!ch_enlargebufs(el, (size_t)2))
 					break;
 				cp = &el->el_line.buffer[idx];
+			}
 			cp++;
 			if (el->el_flags & UNBUFFERED)
 				break;
 			if (cp[-1] == '\r' || cp[-1] == '\n')
 				break;
+		}
 		if (num == -1) {
 			if (errno == EINTR)
 				cp = el->el_line.buffer;
 			el->el_errno = errno;
 @@ -534,27 +534,27 @@ FUN(el,gets)(EditLine *el, int *nread)
 		size_t idx;
 		if ((el->el_flags & UNBUFFERED) == 0)
 			cp = el->el_line.buffer;
 		else
 			cp = el->el_line.lastchar;
 		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))
+				if (!ch_enlargebufs(el, (size_t)2))
 					break;
 				cp = &el->el_line.buffer[idx];
+			}
 			cp++;
 			crlf = cp[-1] == '\r' || cp[-1] == '\n';
 			if (el->el_flags & UNBUFFERED)
 				break;
 			if (crlf)
 				break;
+		}
 		if (num == -1) {
 			if (errno == EINTR)
 @@ -667,27 +667,27 @@ FUN(el,gets)(EditLine *el, int *nread)
 		case CC_NEWLINE:	/* normal end of line */
 			num = (int)(el->el_line.lastchar - el->el_line.buffer);
 			break;
 		case CC_FATAL:	/* fatal error, reset to known state */
 #ifdef DEBUG_READ
 			(void) fprintf(el->el_errfile,
 			    "*** editor fatal ERROR ***\r\n\n");
 #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 */
+			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 */
 			terminal_beep(el);
 			terminal__flush(el);
 			break;
+		}
 		el->el_state.argument = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: readline.c,v 1.97 2011/07/29 20:58:07 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.98 2011/07/29 23:44:44 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL 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)
-__RCSID("$NetBSD: readline.c,v 1.97 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.98 2011/07/29 23:44:44 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <string.h>
 #include <pwd.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 @@ -211,43 +211,40 @@ _getc_function(EditLine *el __attribute_
 		return 0;
 	*c = i;
 	return 1;
+}
 static void
 _resize_fun(EditLine *el, void *a)
+{
 	const LineInfo *li;
 	char **ap = a;
 	li = el_line(el);
 	/* a cheesy way to get rid of const cast. */
-	*ap = memchr(li->buffer, *li->buffer, 1);
+	*ap = memchr(li->buffer, *li->buffer, (size_t)1);
+}
 static const char _dothistory[] = "/.history";
 static const char *
 _default_history_file(void)
+{
 	struct passwd *p;
 	static char path[PATH_MAX];
 	if (*path)
 		return path;
 	if ((p = getpwuid(getuid())) == NULL)
 		return NULL;
-	strlcpy(path, p->pw_dir, PATH_MAX);
+	(void)snprintf(path, sizeof(path), "%s/.history", p->pw_dir);
 	strlcat(path, _dothistory, PATH_MAX);
 	return path;
+}
 /*
  * READLINE compatibility stuff
  */
 /*
  * Set the prompt
  */
 int
 rl_set_prompt(const char *prompt)
+{
 @@ -1179,52 +1176,53 @@ history_truncate_file (const char *filen
 	strcpy(template, _history_tmp_template);
 	if ((fd = mkstemp(template)) == -1) {
 		ret = errno;
 		goto out1;
+	}
 	if ((tp = fdopen(fd, "r+")) == NULL) {
 		close(fd);
 		ret = errno;
 		goto out2;
+	}
 	for(;;) {
-		if (fread(buf, sizeof(buf), 1, fp) != 1) {
+		if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
 			if (ferror(fp)) {
 				ret = errno;
 				break;
+			}
 			if (fseeko(fp, (off_t)sizeof(buf) * count, SEEK_SET) ==
 			    (off_t)-1) {
 				ret = errno;
 				break;
+			}
-			left = fread(buf, 1, sizeof(buf), fp);
+			left = fread(buf, (size_t)1, sizeof(buf), fp);
 			if (ferror(fp)) {
 				ret = errno;
 				break;
+			}
 			if (left == 0) {
 				count--;
 				left = sizeof(buf);
-			} else if (fwrite(buf, (size_t)left, 1, tp) != 1) {
+			} else if (fwrite(buf, (size_t)left, (size_t)1, tp)
 			    != 1) {
 				ret = errno;
 				break;
+			}
 			fflush(tp);
 			break;
+		}
-		if (fwrite(buf, sizeof(buf), 1, tp) != 1) {
+		if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
 			ret = errno;
 			break;
+		}
 		count++;
+	}
 	if (ret)
 		goto out3;
 	cp = buf + left - 1;
 	if(*cp != '\n')
 		cp++;
 	for(;;) {
 		while (--cp >= buf) {
 			if (*cp == '\n') {
 @@ -1234,58 +1232,58 @@ history_truncate_file (const char *filen
 						cp = buf;
+					}
 					break;
+				}
+			}
+		}
 		if (nlines <= 0 || count == 0)
 			break;
 		count--;
 		if (fseeko(tp, (off_t)sizeof(buf) * count, SEEK_SET) < 0) {
 			ret = errno;
 			break;
+		}
-		if (fread(buf, sizeof(buf), 1, tp) != 1) {
+		if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
 			if (ferror(tp)) {
 				ret = errno;
 				break;
+			}
 			ret = EAGAIN;
 			break;
+		}
 		cp = buf + sizeof(buf);
+	}
 	if (ret || nlines > 0)
 		goto out3;
-	if (fseeko(fp, 0, SEEK_SET) == (off_t)-1) {
+	if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
 		ret = errno;
 		goto out3;
+	}
 	if (fseeko(tp, (off_t)sizeof(buf) * count + (cp - buf), SEEK_SET) ==
 	    (off_t)-1) {
 		ret = errno;
 		goto out3;
+	}
 	for(;;) {
-		if ((left = fread(buf, 1, sizeof(buf), tp)) == 0) {
+		if ((left = fread(buf, (size_t)1, sizeof(buf), tp)) == 0) {
 			if (ferror(fp))
 				ret = errno;
 			break;
+		}
-		if (fwrite(buf, (size_t)left, 1, fp) != 1) {
+		if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
 			ret = errno;
 			break;
+		}
+	}
 	fflush(fp);
 	if((off = ftello(fp)) > 0)
 		(void)ftruncate(fileno(fp), off);
 out3:
 	fclose(tp);
 out2:
 	unlink(template);
 out1:
 	fclose(fp);
 @@ -2045,27 +2043,27 @@ _rl_event_read_char(EditLine *el, char *
+{
 	int	n;
 	ssize_t num_read = 0;
 	*cp = '\0';
 	while (rl_event_hook) {
 		(*rl_event_hook)();
 #if defined(FIONREAD)
 		if (ioctl(el->el_infd, FIONREAD, &n) < 0)
 			return -1;
 		if (n)
-			num_read = read(el->el_infd, cp, 1);
+			num_read = read(el->el_infd, cp, (size_t)1);
 		else
 			num_read = 0;
 #elif defined(F_SETFL) && defined(O_NDELAY)
 		if ((n = fcntl(el->el_infd, F_GETFL, 0)) < 0)
 			return -1;
 		if (fcntl(el->el_infd, F_SETFL, n|O_NDELAY) < 0)
 			return -1;
 		num_read = read(el->el_infd, cp, 1);
 		if (fcntl(el->el_infd, F_SETFL, n))
 			return -1;
 #else
 		/* not non-blocking, but what you gonna do? */
 		num_read = read(el->el_infd, cp, 1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refresh.c,v 1.36 2011/07/28 01:05:20 christos Exp $	*/
+/*	$NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 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[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: refresh.c,v 1.36 2011/07/28 01:05:20 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * refresh.c: Lower level screen refreshing functions
  */
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
 #include "el.h"
 @@ -1071,27 +1071,27 @@ re_fastputc(EditLine *el, Int c)
 		/*
 		 * If we would overflow (input is longer than terminal size),
 		 * emulate scroll by dropping first line and shuffling the rest.
 		 * We do this via pointer shuffling - it's safe in this case
 		 * and we avoid memcpy().
 		 */
 		if (el->el_cursor.v + 1 >= el->el_terminal.t_size.v) {
 			int i, lins = el->el_terminal.t_size.v;
 			Char *firstline = el->el_display[0];
 			for(i = 1; i < lins; i++)
 				el->el_display[i - 1] = el->el_display[i];
-			re__copy_and_pad(firstline, STR(""), 0);
+			re__copy_and_pad(firstline, STR(""), (size_t)0);
 			el->el_display[i - 1] = firstline;
 		} else {
 			el->el_cursor.v++;
 			el->el_refresh.r_oldcv++;
+		}
 		if (EL_HAS_AUTO_MARGINS) {
 			if (EL_HAS_MAGIC_MARGINS) {
 				terminal__putc(el, ' ');
 				terminal__putc(el, '\b');
+			}
 		} else {
 			terminal__putc(el, '\r');
 			terminal__putc(el, '\n');

 @@ -1,14 +1,14 @@
-/*	$NetBSD: search.c,v 1.27 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: search.c,v 1.28 2011/07/29 23:44:45 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[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: search.c,v 1.27 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.28 2011/07/29 23:44:45 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * search.c: History and character search functions
  */
 #include <stdlib.h>
 #if defined(REGEX)
 #include <regex.h>
 #elif defined(REGEXP)
 #include <regexp.h>
 #endif
 #include "el.h"
 @@ -118,27 +118,28 @@ el_match(const Char *str, const Char *pa
 #elif defined (REGEXP)
 	regexp *rp;
 	int rv;
 #else
 	extern char	*re_comp(const char *);
 	extern int	 re_exec(const char *);
 #endif
 	if (Strstr(str, pat) != 0)
 		return 1;
 #if defined(REGEX)
 	if (regcomp(&re, ct_encode_string(pat, &conv), 0) == 0) {
-		rv = regexec(&re, ct_encode_string(str, &conv), 0, NULL, 0) == 0;
+		rv = regexec(&re, ct_encode_string(str, &conv), (size_t)0, NULL,
 ) == 0;
 		regfree(&re);
 	} else {
 		rv = 0;
+	}
 	return rv;
 #elif defined(REGEXP)
 	if ((re = regcomp(ct_encode_string(pat, &conv))) != NULL) {
 		rv = regexec(re, ct_encode_string(str, &conv));
 		el_free(re);
 	} else {
 		rv = 0;
+	}
 	return rv;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: terminal.c,v 1.6 2011/07/29 15:20:39 christos Exp $	*/
+/*	$NetBSD: terminal.c,v 1.7 2011/07/29 23:44:45 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[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: terminal.c,v 1.6 2011/07/29 15:20:39 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.7 2011/07/29 23:44:45 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * terminal.c: Editor/termcap-curses interface
  *	       We have to declare a static variable here, since the
  *	       termcap putchar routine does not take an argument!
  */
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 @@ -72,27 +72,27 @@ __RCSID("$NetBSD: terminal.c,v 1.6 2011/
 #ifdef _REENTRANT
 #include <pthread.h>
 #endif
 #include "el.h"
 /*
  * IMPORTANT NOTE: these routines are allowed to look at the current screen
  * and the current position assuming that it is correct.  If this is not
  * true, then the update will be WRONG!  This is (should be) a valid
  * assumption...
  */
-#define	TC_BUFSIZE	2048
+#define	TC_BUFSIZE	((size_t)2048)
 #define	GoodStr(a)	(el->el_terminal.t_str[a] != NULL && \
 			    el->el_terminal.t_str[a][0] != '\0')
 #define	Str(a)		el->el_terminal.t_str[a]
 #define	Val(a)		el->el_terminal.t_val[a]
 private const struct termcapstr {
 	const char *name;
 	const char *long_name;
 } tstr[] = {
 #define	T_al	0
 	{ "al", "add new blank line" },
 #define	T_bl	1
 @@ -343,44 +343,44 @@ terminal_alloc(EditLine *el, const struc
          */
 	if (clen <= tlen) {
 		if (*str)
 			(void) strcpy(*str, cap);	/* XXX strcpy is safe */
 		return;
+	}
 	/*
          * New string is longer; see if we have enough space to append
          */
 	if (el->el_terminal.t_loc + 3 < TC_BUFSIZE) {
 						/* XXX strcpy is safe */
 		(void) strcpy(*str = &el->el_terminal.t_buf[
 		    el->el_terminal.t_loc], cap);
-		el->el_terminal.t_loc += (int)clen + 1;	/* one for \0 */
+		el->el_terminal.t_loc += clen + 1;	/* one for \0 */
 		return;
+	}
 	/*
          * Compact our buffer; no need to check compaction, cause we know it
          * fits...
          */
 	tlen = 0;
 	for (tmp = tlist; tmp < &tlist[T_str]; tmp++)
 		if (*tmp != NULL && *tmp != '\0' && *tmp != *str) {
 			char *ptr;
 			for (ptr = *tmp; *ptr != '\0'; termbuf[tlen++] = *ptr++)
 				continue;
 			termbuf[tlen++] = '\0';
+		}
 	memcpy(el->el_terminal.t_buf, termbuf, TC_BUFSIZE);
-	el->el_terminal.t_loc = (int)tlen;
+	el->el_terminal.t_loc = tlen;
 	if (el->el_terminal.t_loc + 3 >= TC_BUFSIZE) {
 		(void) fprintf(el->el_errfile,
 		    "Out of termcap string space.\n");
 		return;
+	}
 					/* XXX strcpy is safe */
 	(void) strcpy(*str = &el->el_terminal.t_buf[el->el_terminal.t_loc],
 	    cap);
 	el->el_terminal.t_loc += (int)clen + 1;	/* one for \0 */
 	return;
+}
 @@ -659,27 +659,27 @@ terminal_overwrite(EditLine *el, const C
                 el->el_cursor.h++;
         } while (--n);
 	if (el->el_cursor.h >= el->el_terminal.t_size.h) {	/* wrap? */
 		if (EL_HAS_AUTO_MARGINS) {	/* yes */
 			el->el_cursor.h = 0;
 			el->el_cursor.v++;
 			if (EL_HAS_MAGIC_MARGINS) {
 				/* force the wrap to avoid the "magic"
 				 * situation */
 				Char c;
 				if ((c = el->el_display[el->el_cursor.v]
 				    [el->el_cursor.h]) != '\0') {
-					terminal_overwrite(el, &c, 1);
+					terminal_overwrite(el, &c, (size_t)1);
 #ifdef WIDECHAR
 					while (el->el_display[el->el_cursor.v]
 					    [el->el_cursor.h] == MB_FILL_CHAR)
 						el->el_cursor.h++;
 #endif
 				} else {
 					terminal__putc(el, ' ');
 					el->el_cursor.h = 1;
+				}
+			}
 		} else		/* no wrap, but cursor stays on screen */
 			el->el_cursor.h = el->el_terminal.t_size.h - 1;
+	}
 @@ -1226,27 +1226,27 @@ terminal_tputs(EditLine *el, const char
 #endif
+}
 /* terminal__putc():
  *	Add a character
  */
 protected int
 terminal__putc(EditLine *el, Int c)
+{
 	char buf[MB_LEN_MAX +1];
 	ssize_t i;
 	if (c == MB_FILL_CHAR)
 		return 0;
-	i = ct_encode_char(buf, MB_LEN_MAX, c);
+	i = ct_encode_char(buf, (size_t)MB_LEN_MAX, c);
 	if (i <= 0)
 		return (int)i;
 	buf[i] = '\0';
 	return fputs(buf, el->el_outfile);
+}
 /* terminal__flush():
  *	Flush output
  */
 protected void
 terminal__flush(EditLine *el)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: terminal.h,v 1.2 2011/07/28 01:56:27 christos Exp $	*/
+/*	$NetBSD: terminal.h,v 1.3 2011/07/29 23:44:45 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.
 @@ -53,27 +53,27 @@ typedef struct {
 	const char *t_name;		/* the terminal name	*/
 	coord_t	  t_size;		/* # lines and cols	*/
 	int	  t_flags;
 #define	TERM_CAN_INSERT		0x001	/* Has insert cap	*/
 #define	TERM_CAN_DELETE		0x002	/* Has delete cap	*/
 #define	TERM_CAN_CEOL		0x004	/* Has CEOL cap		*/
 #define	TERM_CAN_TAB		0x008	/* Can use tabs		*/
 #define	TERM_CAN_ME		0x010	/* Can turn all attrs.	*/
 #define	TERM_CAN_UP		0x020	/* Can move up		*/
 #define	TERM_HAS_META		0x040	/* Has a meta key	*/
 #define	TERM_HAS_AUTO_MARGINS	0x080	/* Has auto margins	*/
 #define	TERM_HAS_MAGIC_MARGINS	0x100	/* Has magic margins	*/
 	char	 *t_buf;		/* Termcap buffer	*/
-	int	  t_loc;		/* location used	*/
+	size_t	  t_loc;		/* location used	*/
 	char	**t_str;		/* termcap strings	*/
 	int	 *t_val;		/* termcap values	*/
 	char	 *t_cap;		/* Termcap buffer	*/
 	funckey_t	 *t_fkey;		/* Array of keys	*/
 } el_terminal_t;
 /*
  * fKey indexes
  */
 #define	A_K_DN		0
 #define	A_K_UP		1
 #define	A_K_LT		2
 #define	A_K_RT		3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vi.c,v 1.38 2011/07/29 20:58:07 christos Exp $	*/
+/*	$NetBSD: vi.c,v 1.39 2011/07/29 23:44:45 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.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include "config.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <sys/wait.h>
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vi.c,v 1.38 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.39 2011/07/29 23:44:45 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * vi.c: Vi mode commands.
  */
 #include "el.h"
 private el_action_t	cv_action(EditLine *, Int);
 private el_action_t	cv_paste(EditLine *, Int);
 /* cv_action():
  *	Handle vi actions.
 @@ -1027,27 +1027,27 @@ vi_histedit(EditLine *el, Int c __attrib
 		return CC_ERROR;
+	}
 	line = el_malloc(len * sizeof(*line));
 	if (line == NULL) {
 		el_free(cp);
 		return CC_ERROR;
+	}
 	Strncpy(line, el->el_line.buffer, len);
 	line[len] = '\0';
 	ct_wcstombs(cp, line, TMP_BUFSIZ - 1);
 	cp[TMP_BUFSIZ - 1] = '\0';
 	len = strlen(cp);
 	write(fd, cp, len);
-	write(fd, "\n", 1);
+	write(fd, "\n", (size_t)1);
 	pid = fork();
 	switch (pid) {
 	case -1:
 		close(fd);
 		unlink(tempfile);
 		el_free(cp);
                 el_free(line);
 		return CC_ERROR;
 	case 0:
 		close(fd);
 		execlp("vi", "vi", tempfile, (char *)NULL);
 		exit(0);
 		/*NOTREACHED*/

 @@ -1,24 +1,24 @@
-#	$NetBSD: Makefile,v 1.45 2011/07/29 20:56:58 christos Exp $
+#	$NetBSD: Makefile,v 1.46 2011/07/29 23:44:44 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 USE_SHLIBDIR=	yes
 WIDECHAR ?= yes
 WARNS=	4
 LIB=	edit
 LIBDPLIBS+=     terminfo ${.CURDIR}/../libterminfo
-COPTS+=-Wunused-parameter
+COPTS+=-Wunused-parameter -Wconversion
 OSRCS=	chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
 	hist.c keymacro.c map.c chartype.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c
 MAN=	editline.3 editrc.5
 MLINKS=	editline.3 el_init.3 editline.3 el_end.3 editline.3 el_reset.3 \
 	editline.3 el_gets.3 editline.3 el_getc.3 editline.3 el_push.3 \
 	editline.3 el_parse.3 editline.3 el_set.3 editline.3 el_get.3 \
 	editline.3 el_source.3 editline.3 el_resize.3 editline.3 el_line.3 \
 	editline.3 el_insertstr.3 editline.3 el_deletestr.3 \
 	editline.3 history_init.3 editline.3 history_end.3 \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: el.h,v 1.24 2011/07/28 01:56:27 christos Exp $	*/
+/*	$NetBSD: el.h,v 1.25 2011/07/29 23:44:44 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.
 @@ -41,27 +41,27 @@
 #define	_h_el
 /*
  * Local defaults
  */
 #define	KSHVI
 #define	VIDEFAULT
 #define	ANCHOR
 #include "histedit.h"
 #include "chartype.h"
 #include <stdio.h>
 #include <sys/types.h>
-#define	EL_BUFSIZ	1024		/* Maximum line size		*/
+#define	EL_BUFSIZ	((size_t)1024)	/* Maximum line size		*/
 #define	HANDLE_SIGNALS	0x01
 #define	NO_TTY		0x02
 #define	EDIT_DISABLED	0x04
 #define	UNBUFFERED	0x08
 #define	CHARSET_IS_UTF8 0x10
 #define	IGNORE_EXTCHARS 0x20            /* Ignore characters read > 0xff */
 #define	NARROW_HISTORY	0x40
 #define	NARROW_READ	0x80
 typedef int bool_t;			/* True or not			*/
 typedef unsigned char el_action_t;	/* Index to command array	*/