 @@ -1,17 +1,17 @@
-/* $NetBSD: term_private.h,v 1.10 2012/06/03 23:19:10 joerg Exp $ */
+/* $NetBSD: term_private.h,v 1.11 2013/01/24 10:41:28 roy Exp $ */
 /*
- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2010, 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -147,14 +147,17 @@ typedef struct {
 	TBUF strs;
 	TBUF extras;
 } TIC;
 char *_ti_grow_tbuf(TBUF *, size_t);
 char *_ti_get_token(char **, char);
 char *_ti_find_cap(TBUF *, char,  short);
 char *_ti_find_extra(TBUF *, const char *);
 size_t _ti_store_extra(TIC *, int, char *, char, char, short,
     char *, size_t, int);
 TIC *_ti_compile(char *, int);
 ssize_t _ti_flatten(uint8_t **, const TIC *);
 void _ti_freetic(TIC *);
 #define TPARM_MAX 9	/* not likely to change */
 int _ti_parm_analyse(const char *, int *, int);
 #endif

 @@ -1,58 +1,58 @@
-/* $NetBSD: tparm.c,v 1.11 2013/01/24 10:28:28 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.12 2013/01/24 10:41:28 roy Exp $ */
 /*
- * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
+ * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * 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.11 2013/01/24 10:28:28 roy Exp $");
+__RCSID("$NetBSD: tparm.c,v 1.12 2013/01/24 10:41:28 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)
-#define BUFINC 128 /* Size to increament the terminal buffer by */
+#define BUFINC 128	/* Size to increament the terminal buffer by */
 static TERMINAL *dumbterm; /* For non thread safe functions */
 typedef struct {
 	long nums[20];
 	char *strings[20];
 	size_t offset;
 } TPSTACK;
 typedef struct {
 	long num;
 	char *string;
 } TPVAR;
 @@ -121,38 +121,83 @@ static size_t
 onum(TERMINAL *term, const char *fmt, int num, unsigned int len)
+{
 	size_t l;
 	if (len < LONG_STR_MAX)
 		len = LONG_STR_MAX;
 	if (checkbuf(term, len + 2) == NULL)
 		return 0;
 	l = sprintf(term->_buf + term->_bufpos, fmt, num);
 	term->_bufpos += l;
 	return l;
+}
 /*
   Make a pass through the string so we can work out
   which parameters are ints and which are char *.
   Basically we only use char * if %p[1-9] is followed by %l or %s.
 */
 int
 _ti_parm_analyse(const char *str, int *piss, int piss_len)
+{
 	int nparm, lpop;
 	char c;
 	nparm = 0;
 	lpop = -1;
 	while ((c = *str++) != '\0') {
 		if (c != '%')
 			continue;
 		c = *str++;
 		switch (c) {
 			case 'l': /* FALLTHROUGH */
 			case 's':
 				if (lpop > 0) {
 					if (lpop <= piss_len)
 						piss[lpop - 1] = 1;
 					else if (piss)
 						errno = E2BIG;
+				}
 				break;
 			case 'p':
 				c = *str++;
 				if (c < '1' || c > '9') {
 					errno = EINVAL;
 					continue;
 				} else {
 					lpop = c - '0';
 					if (lpop > nparm)
 						nparm = lpop;
+				}
 				break;
 			default:
 				lpop = -1;
+		}
+	}
 	return nparm;
+}
 static char *
 _ti_tiparm(TERMINAL *term, const char *str, int va_long, va_list parms)
+{
 	const char *sp;
 	char c, fmt[64], *fp, *ostr;
 	long val, val2;
 	long dnums[26]; /* dynamic variables a-z, not preserved */
 	size_t l, max;
 	TPSTACK stack;
-	TPVAR params[9];
+	TPVAR params[TPARM_MAX];
 	unsigned int done, dot, minus, width, precision, olen;
-	int piss[9]; /* Parameter IS String - piss ;) */
+	int piss[TPARM_MAX]; /* Parameter IS String - piss ;) */
 	if (str == NULL)
 		return NULL;
 	/*
 	  If not passed a terminal, malloc a dummy one.
 	  This means we can preserve buffers and variables per terminal and
 	  still work with non thread safe functions (which sadly are still the
 	  norm and standard).
 	*/
 	if (term == NULL) {
 		if (dumbterm == NULL) {
 			dumbterm = malloc(sizeof(*dumbterm));
 @@ -162,60 +207,28 @@ _ti_tiparm(TERMINAL *term, const char *s
+		}
 		term = dumbterm;
+	}
 	term->_bufpos = 0;
 	/* Ensure we have an initial buffer */
 	if (term->_buflen == 0) {
 		term->_buf = malloc(BUFINC);
 		if (term->_buf == NULL)
 			return NULL;
 		term->_buflen = BUFINC;
+	}
 	/*
 	  Make a first pass through the string so we can work out
 	  which parameters are ints and which are char *.
 	  Basically we only use char * if %p[1-9] is followed by %l or %s.
 	*/
 	memset(&piss, 0, sizeof(piss));
-	max = 0;
+	max = _ti_parm_analyse(str, piss, TPARM_MAX);
 	sp = str;
 	while ((c = *sp++) != '\0') {
 		if (c != '%')
 			continue;
 		c = *sp++;
 		if (c == '\0')
 			break;
 		if (c != 'p')
 			continue;
 		c = *sp++;
 		if (c < '1' || c > '9') {
 			errno = EINVAL;
 			continue;
 		l = c - '0';
 		if (l > max)
 			max = l;
 		if (*sp != '%')
 			continue;
 		/* Skip formatting */
 		sp++;
 		while (*sp == '.' || *sp == '#' || *sp == ' ' || *sp == ':' ||
 		    *sp == '-' || isdigit((unsigned char)*sp))
 			sp++;
 		if (*sp == 'l' || *sp == 's')
 			piss[l - 1] = 1;
 	/* Put our parameters into variables */
 	memset(&params, 0, sizeof(params));
 	for (l = 0; l < max; l++) {
 		if (piss[l])
 			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));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tput.c,v 1.22 2011/10/04 12:23:14 roy Exp $	*/
+/*	$NetBSD: tput.c,v 1.23 2013/01/24 10:41:29 roy Exp $	*/
 /*-
  * Copyright (c) 1980, 1988, 1993
  *	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.
 @@ -29,37 +29,39 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)tput.c	8.3 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: tput.c,v 1.22 2011/10/04 12:23:14 roy Exp $");
+__RCSID("$NetBSD: tput.c,v 1.23 2013/01/24 10:41:29 roy Exp $");
 #endif /* not lint */
 #include <termios.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <term_private.h>
 #include <term.h>
 #include <termcap.h>
 #include <unistd.h>
 static int    outc(int);
 static void   usage(void) __dead;
 static char **process(const char *, const char *, char **);
 int
 main(int argc, char **argv)
+{
 	int ch, exitval, n;
 	char *term;
 	const char *p, *s;
 	size_t pl;
 @@ -130,104 +132,67 @@ main(int argc, char **argv)
 		if (argv == NULL)
 			break;
+	}
 	return argv ? exitval : 2;
+}
 static char **
 process(const char *cap, const char *str, char **argv)
+{
 	static const char errfew[] =
 	    "Not enough arguments (%d) for capability `%s'";
 	static const char erresc[] =
-	    "Unknown %% escape `%c' for capability `%s'";
+	    "Unknown %% escape (%s) for capability `%s'";
-	char c, l;
+	static const char errnum[] =
-	const char *p;
+	    "Expected a numeric argument [%d] (%s) for capability `%s'";
-	int arg_need, p1, p2, p3, p4, p5, p6, p7, p8, p9;
+	int i, nparams, piss[TPARM_MAX];
 	long nums[TPARM_MAX];
 	char *strs[TPARM_MAX], *tmp;
 	/* Count how many values we need for this capability. */
-	arg_need = 0;
+	errno = 0;
-	p = str;
+	memset(&piss, 0, sizeof(piss));
-	while ((c = *p++) != '\0') {
+	nparams = _ti_parm_analyse(str, piss, TPARM_MAX);
-		if (c != '%')
+	if (errno == EINVAL)
-			continue;
+		errx(2, erresc, str, cap);
 		c = *p++;
-		if (c == '\0')
+	/* Create our arrays of integers and strings */
-			break;
+	for (i = 0; i < nparams; i++) {
-		if (c != 'p')
+		if (*++argv == NULL || *argv[0] == '\0')
-			continue;
+			errx(2, errfew, nparams, cap);
-		c = *p++;
+		if (piss[i])
-		if (c < '1' || c > '9')
+			strs[i] = *argv;
-			errx(2, erresc, c, cap);
+		else {
-		l = c - '0';
+			errno = 0;
-		if (l > arg_need)
+			nums[i] = strtol(*argv, &tmp, 0);
-			arg_need = l;
+			if ((errno == ERANGE &&
 			    (nums[i] == LONG_MIN || nums[i] == LONG_MAX)) ||
 			    (errno != 0 && nums[i] == 0) ||
-#define NEXT_ARG							      \
+			    tmp == str ||
-	{								      \
+			    *tmp != '\0')
-		if (*++argv == NULL || *argv[0] == '\0')		      \
+				errx(2, errnum, i + 1, *argv, cap);
 			errx(2, errfew, 1, cap);			      \
 		if (piss[i])
 			printf ("str %d %s\n", i, strs[i]);
 		else
 			printf ("num %d %ld\n", i, nums[i]);
+	}
-	if (arg_need > 0) {
+	/* And output */
-		NEXT_ARG;
+#define p(i)	(i <= nparams ? \
-		p1 = atoi(*argv);
+		    (piss[i - 1] ? (long)strs[i - 1] : nums[i - 1]) : 0)
-	} else
+	puts(tparm(str, p(1), p(2), p(3), p(4), p(5), p(6), p(7), p(8), p(9)));
 		p1 = 0;
 	if (arg_need > 1) {
 		NEXT_ARG;
 		p2 = atoi(*argv);
 	} else
 		p2 = 0;
 	if (arg_need > 2) {
 		NEXT_ARG;
 		p3 = atoi(*argv);
 	} else
 		p3 = 0;
 	if (arg_need > 3) {
 		NEXT_ARG;
 		p4 = atoi(*argv);
 	} else
 		p4 = 0;
 	if (arg_need > 4) {
 		NEXT_ARG;
 		p5 = atoi(*argv);
 	} else
 		p5 = 0;
 	if (arg_need > 5) {
 		NEXT_ARG;
 		p6 = atoi(*argv);
 	} else
 		p6 = 0;
 	if (arg_need > 6) {
 		NEXT_ARG;
 		p7 = atoi(*argv);
 	} else
 		p7 = 0;
 	if (arg_need > 7) {
 		NEXT_ARG;
 		p8 = atoi(*argv);
 	} else
 		p8 = 0;
 	if (arg_need > 8) {
 		NEXT_ARG;
 		p9 = atoi(*argv);
 	} else
 		p9 = 0;
 	/* And print them. */
 	(void)tputs(tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9), 0, outc);
 	return argv;
+}
 static int
 outc(int c)
+{
 	return putchar(c);
+}
 static void
 usage(void)
+{
 	(void)fprintf(stderr,

 @@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.10 2010/02/03 15:34:46 roy Exp $
+#	$NetBSD: Makefile,v 1.11 2013/01/24 10:41:28 roy Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 PROG=	tput
 DPADD=	${LIBTERMINFO}
 LDADD=	-lterminfo
 MLINKS=	tput.1 clear.1
 SCRIPTS=clear.sh
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libterminfo
 .include <bsd.prog.mk>