 @@ -1,14 +1,14 @@
-/*	$NetBSD: addbytes.c,v 1.36 2010/02/23 19:48:26 drochner Exp $	*/
+/*	$NetBSD: addbytes.c,v 1.37 2010/11/23 05:38:35 tnozaki Exp $	*/
 /*
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  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.
 @@ -24,31 +24,32 @@
  * 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 <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: addbytes.c,v 1.36 2010/02/23 19:48:26 drochner Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.37 2010/11/23 05:38:35 tnozaki Exp $");
 #endif
 #endif				/* not lint */
 #include <stdlib.h>
 #include <string.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifdef DEBUG
 #include <assert.h>
 #endif
 #define	SYNCH_IN	{y = win->cury; x = win->curx;}
 #define	SYNCH_OUT	{win->cury = y; win->curx = x;}
 #define	PSYNCH_IN	{*y = win->cury; *x = win->curx;}
 #define	PSYNCH_OUT	{win->cury = *y; win->curx = *x;}
 #ifndef _CURSES_USE_MACROS
 @@ -119,54 +120,54 @@ __waddbytes(WINDOW *win, const char *byt
 	for (i = 0; i < win->maxy; i++) {
 		assert(win->alines[i]->sentinel == SENTINEL_VALUE);
+	}
 	__CTRACE(__CTRACE_INPUT, "ADDBYTES: add %d bytes\n", count);
 #endif
 	err = OK;
 	SYNCH_IN;
 	lp = win->alines[y];
 #ifdef HAVE_WCHAR
-	(void)mbrtowc(NULL, NULL, (size_t)0, &st);
+	(void)memset(&st, 0, sizeof(st));
 #endif
 	while (count > 0) {
 #ifndef HAVE_WCHAR
 		c = *bytes++;
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT, "ADDBYTES('%c', %x) at (%d, %d)\n",
 		    c, attr, y, x);
 #endif
 		err = _cursesi_addbyte(win, &lp, &y, &x, c, attr);
 		count--;
 #else
 		/*
 		 * For wide character support only, try and convert the
 		 * given string into a wide character - we do this because
 		 * this is how ncurses behaves (not that I think this is
 		 * actually the correct thing to do but if we don't do it
 		 * a lot of things that rely on this behaviour will break
 		 * and we will be blamed).  If the conversion succeeds
 		 * then we eat the n characters used to make the wide char
 		 * from the string.
 		 */
 		n = (int)mbrtowc(&wc, bytes, (size_t)count, &st);
 		if (n < 0) {
 			/* not a valid conversion just eat a char */
 			wc = *bytes;
 			n = 1;
-			(void)mbrtowc(NULL, NULL, (size_t)0, &st);
+			(void)memset(&st, 0, sizeof(&st));
 		} else if (wc == 0) {
 			break;
+		}
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 		 "ADDBYTES WIDE(0x%x [%s], %x) at (%d, %d), ate %d bytes\n",
 		 (unsigned) wc, unctrl((unsigned) wc), attr, y, x, n);
 #endif
 		cc.vals[0] = wc;
 		cc.elements = 1;
 		cc.attributes = attr;
 		err = _cursesi_addwchar(win, &lp, &y, &x, &cc);
 		bytes += n;