 @@ -1,14 +1,14 @@
-.\"	$NetBSD: terminfo.3,v 1.8 2011/10/04 11:01:14 roy Exp $
+.\"	$NetBSD: terminfo.3,v 1.9 2013/01/25 12:30:05 roy Exp $
 .\"
 .\" Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Roy Marples.
 .\"
 .\" 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
 @@ -17,27 +17,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" 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.
 .\"
-.Dd October 4, 2011
+.Dd January 25, 2013
 .Dt TERMINFO 3
 .Os
 .Sh NAME
 .Nm setupterm ,
 .Nm set_curterm ,
 .Nm del_curterm ,
 .Nm termname ,
 .Nm longname ,
 .Nm tigetflag ,
 .Nm tigetnum ,
 .Nm tigetstr ,
 .Nm tparm ,
 .Nm tputs ,
 @@ -177,26 +177,32 @@ The
 function returns a string decoded from
 .Va cm
 with the parameters
 .Va p1
 \&...
 .Va p9
 applied.
 Some capabilities require string parameters and only platforms that can fit
+a
 .Vt char *
 pointer inside a
 .Vt long
 can use them.
 For platforms which don't support this,
 .Dv NULL
 is returned and
 .Va errno
 is set to
 .Er ENOTSUPP .
 The string encoding and parameter application is described in
 .Xr terminfo 5 .
 .Pp
 The
 .Fn tputs
 function applies padding information to the string
 .Va cp ;
 .Va affcnt
 gives the number of lines affected by the operation,
 or 1 if this is not applicable;
 .Va outc
 is a function which is called by each character in turn.
 The external variable

 @@ -1,14 +1,14 @@
-/* $NetBSD: tparm.c,v 1.12 2013/01/24 10:41:28 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.13 2013/01/25 12:30:05 roy Exp $ */
 /*
  * Copyright (c) 2009, 2011, 2013 The NetBSD Foundation, Inc.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roy Marples.
+ *
  * 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
 @@ -18,27 +18,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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 <sys/cdefs.h>
-__RCSID("$NetBSD: tparm.c,v 1.12 2013/01/24 10:41:28 roy Exp $");
+__RCSID("$NetBSD: tparm.c,v 1.13 2013/01/25 12:30:05 roy Exp $");
 #include <sys/param.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <term_private.h>
 #include <term.h>
 #define LONG_STR_MAX ((CHAR_BIT * sizeof(long)) / 3)
 @@ -213,32 +213,45 @@ _ti_tiparm(TERMINAL *term, const char *s
 	if (term->_buflen == 0) {
 		term->_buf = malloc(BUFINC);
 		if (term->_buf == NULL)
 			return NULL;
 		term->_buflen = BUFINC;
+	}
 	memset(&piss, 0, sizeof(piss));
 	max = _ti_parm_analyse(str, piss, TPARM_MAX);
 	/* Put our parameters into variables */
 	memset(&params, 0, sizeof(params));
 	for (l = 0; l < max; l++) {
-		if (piss[l])
+		if (piss[l]) {
-			params[l].string = va_arg(parms, char *);
+			if (va_long) {
-		else if (va_long)
+				/* This only works if char * fits into a long
-			params[l].num = va_arg(parms, long);
+				 * on this platform. */
-		else
+				if (sizeof(char *) <= sizeof(long)/*CONSTCOND*/)
-			params[l].num = (long)va_arg(parms, int);
+					params[l].string =
 					    (char *)va_arg(parms, long);
 				else {
 					errno = ENOTSUP;
 					return NULL;
+				}
 			} else
 				params[l].string = va_arg(parms, char *);
 		} else {
 			if (va_long)
 				params[l].num = va_arg(parms, long);
 			else
 				params[l].num = (long)va_arg(parms, int);
+		}
+	}
 	memset(&stack, 0, sizeof(stack));
 	while ((c = *str++) != '\0') {
 		if (c != '%' || (c = *str++) == '%') {
 			if (c == '\0')
 				break;
 			if (ochar(term, c) == 0)
 				return NULL;
 			continue;
+		}
 		/* Handle formatting. */