 @@ -1,14 +1,14 @@
-/*	$NetBSD: chartype.c,v 1.2 2009/12/31 18:32:37 christos Exp $	*/
+/*	$NetBSD: chartype.c,v 1.3 2010/01/12 19:37:18 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,27 +28,27 @@
  * 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.2 2009/12/31 18:32:37 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.3 2010/01/12 19:37:18 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include "el.h"
 #include <stdlib.h>
 #define CT_BUFSIZ 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) {
 @@ -149,27 +149,27 @@ ct_decode_argv(int argc, const char *arg
 	/* 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);
 	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;
-			bytes = -1;
+			continue;
 		} else {
 			wargv[i] = p;
 			bytes = mbstowcs(p, argv[i], bufspace);
+		}
 		if (bytes == -1) {
 			el_free(wargv);
 			return NULL;
 		} else
 			bytes++;  /* include '\0' in the count */
 		bufspace -= bytes;
 		p += bytes;
+	}
 @@ -285,26 +285,28 @@ ct_visual_width(Char c)
 		return 4; /* \123 */
 #endif
 	default:
 		return 0; /* should not happen */
+	}
+}
 protected ssize_t
 ct_visual_char(Char *dst, size_t len, Char c)
+{
 	int t = ct_chr_class(c);
 	switch (t) {
 	case CHTYPE_TAB:
 	case CHTYPE_NL:
 	case CHTYPE_ASCIICTL:
 		if (len < 2)
 			return -1;   /* insufficient space */
 		*dst++ = '^';
 		if (c == '\177')
 			*dst = '?'; /* DEL -> ^? */
 		else
 			*dst = c | 0100;    /* uncontrolify it */
 		return 2;
 	case CHTYPE_PRINT:
 		if (len < 1)
 			return -1;  /* insufficient space */
 		*dst = c;
 @@ -325,28 +327,26 @@ ct_visual_char(Char *dst, size_t len, Ch
 		*dst++ = tohexdigit(((unsigned int) c >>  8) & 0xf);
 		*dst++ = tohexdigit(((unsigned int) c >>  4) & 0xf);
 		*dst   = tohexdigit(((unsigned int) c      ) & 0xf);
 		return (c > 0xffff) ? 8 : 7;
 #else
 		*dst++ = '\\';
 #define tooctaldigit(v) ((v) + '0')
 		*dst++ = tooctaldigit(((unsigned int) c >> 6) & 0x7);
 		*dst++ = tooctaldigit(((unsigned int) c >> 3) & 0x7);
 		*dst++ = tooctaldigit(((unsigned int) c     ) & 0x7);
 #endif
 		/*FALLTHROUGH*/
 	/* these two should be handled outside this function */
 	case CHTYPE_TAB:
 	case CHTYPE_NL:
 	default:            /* we should never hit the default */
 		return 0;
+	}
+}
 protected int
 ct_chr_class(Char c)
+{
 	if (c == '\t')
 		return CHTYPE_TAB;