 @@ -1,14 +1,14 @@
-/* $NetBSD: compile.c,v 1.21 2020/03/29 18:54:57 roy Exp $ */
+/* $NetBSD: compile.c,v 1.22 2020/03/29 21:46:22 roy Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011, 2020 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
 @@ -22,27 +22,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: compile.c,v 1.21 2020/03/29 18:54:57 roy Exp $");
+__RCSID("$NetBSD: compile.c,v 1.22 2020/03/29 21:46:22 roy Exp $");
 #if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
 #endif
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdint.h>
 @@ -54,26 +54,104 @@ __RCSID("$NetBSD: compile.c,v 1.21 2020/
 static void __printflike(2, 3)
 dowarn(int flags, const char *fmt, ...)
+{
 	va_list va;
 	errno = EINVAL;
 	if (flags & TIC_WARNING) {
 		va_start(va, fmt);
 		vwarnx(fmt, va);
 		va_end(va);
+	}
+}
 int
 _ti_promote(TIC *tic)
+{
 	char *obuf, type, flag;
 	const char *cap, *code, *str;
 	size_t n, entries, strl;
 	uint16_t ind;
 	int num, ortype, error = 0;
 	ortype = tic->rtype;
 	tic->rtype = TERMINFO_RTYPE;
 	obuf = tic->name;
 	tic->name = _ti_getname(tic->rtype, tic->name);
 	if (tic->name == NULL) {
 		warn("_ti_getname");
 		tic->name = obuf;
 		return -1;
+	}
 	free(obuf);
 	obuf = tic->nums.buf;
 	cap = obuf;
 	entries = tic->nums.entries;
 	tic->nums.buf = NULL;
 	tic->nums.entries = tic->nums.buflen = tic->nums.bufpos = 0;
 	for (n = entries; n > 0; n--) {
 		ind = _ti_decode_16(&cap);
 		num = _ti_decode_num(&cap, ortype);
 		if (VALID_NUMERIC(num) &&
 		    !_ti_encode_buf_id_num(&tic->nums, ind, num,
 		    _ti_numsize(tic)))
+		{
 			warn("promote num");
 			error = -1;
 			break;
+		}
+	}
 	free(obuf);
 	obuf = tic->extras.buf;
 	cap = obuf;
 	entries = tic->extras.entries;
 	tic->extras.buf = NULL;
 	tic->extras.entries = tic->extras.buflen = tic->extras.bufpos = 0;
 	for (n = entries; n > 0; n--) {
 		num = _ti_decode_16(&cap);
 		strl = 0;
 		code = cap;
 		cap += num;
 		type = *cap++;
 		switch (type) {
 		case 'f':
 			flag = *cap++;
 			break;
 		case 'n':
 			num = _ti_decode_num(&cap, ortype);
 			break;
 		case 's':
 			strl = _ti_decode_16(&cap);
 			str = cap;
 			cap += strl;
 			break;
 		default:
 			errno = EINVAL;
 			break;
+		}
 		if (!_ti_store_extra(tic, 0, code, type, flag, num,
 		    str, strl, TIC_EXTRA))
+		{
 			error = -1;
 			break;
+		}
+	}
 	free(obuf);
 	return error;
+}
 char *
 _ti_grow_tbuf(TBUF *tbuf, size_t len)
+{
 	char *buf;
 	size_t l;
 	_DIAGASSERT(tbuf != NULL);
 	l = tbuf->bufpos + len;
 	if (l > tbuf->buflen) {
 		if (tbuf->buflen == 0)
 			buf = malloc(l);
 		else
 @@ -180,49 +258,61 @@ _ti_getname(int rtype, const char *orig)
 	name = malloc(diff + vlen + 1);
 	if (name == NULL)
 		return NULL;
 	memcpy(name, orig, diff);
 	memcpy(name + diff, verstr, vlen + 1);
 	return name;
+}
 size_t
 _ti_store_extra(TIC *tic, int wrn, const char *id, char type, char flag,
     int num, const char *str, size_t strl, int flags)
+{
-	size_t l;
+	size_t l, capl;
 	_DIAGASSERT(tic != NULL);
 	if (strcmp(id, "use") != 0) {
 		if (_ti_find_extra(tic, &tic->extras, id) != NULL)
 			return 0;
 		if (!(flags & TIC_EXTRA)) {
 			if (wrn != 0)
 				dowarn(flags, "%s: %s: unknown capability",
 				    tic->name, id);
 			return 0;
+		}
+	}
 	l = strlen(id) + 1;
-	if (l > UINT16_T_MAX) {
+	if (l > UINT16_MAX) {
 		dowarn(flags, "%s: %s: cap name is too long", tic->name, id);
 		return 0;
+	}
-	if (!_ti_grow_tbuf(&tic->extras,
+	capl = sizeof(uint16_t) + l + 1;
-		l + strl + sizeof(uint16_t) + _ti_numsize(tic) + 1))
+	switch (type) {
 	case 'f':
 		capl++;
 		break;
 	case 'n':
 		capl += _ti_numsize(tic);
 		break;
 	case 's':
 		capl += sizeof(uint16_t) + strl;
 		break;
+	}
 	if (!_ti_grow_tbuf(&tic->extras, capl))
 		return 0;
 	_ti_encode_buf_count_str(&tic->extras, id, l);
 	tic->extras.buf[tic->extras.bufpos++] = type;
 	switch (type) {
 	case 'f':
 		tic->extras.buf[tic->extras.bufpos++] = flag;
 		break;
 	case 'n':
 		_ti_encode_buf_num(&tic->extras, num, tic->rtype);
 		break;
 	case 's':
 		_ti_encode_buf_count_str(&tic->extras, str, strl);
 		break;
 @@ -423,39 +513,26 @@ _ti_get_token(char **cap, char sep)
 			if (sep == ':' && esc == '\\' && **cap == 'E')
 				esc = 'x';
 			else
 				esc = '\0';
+		}
+	}
 	if (**cap != '\0')
 		*(*cap)++ = '\0';
 	return token;
+}
 static int
 _ti_find_rtype(const char *cap)
 	const char *ptr;
 	for (ptr = cap; (ptr = strchr(ptr, '#')) != NULL;) {
 		if (strtol(++ptr, NULL, 0) > SHRT_MAX) {
 			return TERMINFO_RTYPE;
 	return TERMINFO_RTYPE_O1;
 int
 _ti_encode_buf_id_num(TBUF *tbuf, int ind, int num, size_t len)
+{
 	if (!_ti_grow_tbuf(tbuf, sizeof(uint16_t) + len))
 		return 0;
 	_ti_encode_buf_16(tbuf, ind);
 	if (len == sizeof(uint32_t))
 		_ti_encode_buf_32(tbuf, num);
 	else
 		_ti_encode_buf_16(tbuf, num);
 	tbuf->entries++;
 	return 1;
+}
 @@ -515,28 +592,27 @@ _ti_compile(char *cap, int flags)
 	if (desc != NULL && strlen(desc) > UINT16_MAX - 1) {
 		dowarn(flags, "%s: description too long: %s", name, desc);
 		return NULL;
+	}
 	if (alias != NULL && strlen(alias) > UINT16_MAX - 1) {
 		dowarn(flags, "%s: alias too long: %s", name, alias);
 		return NULL;
+	}
 	tic = calloc(sizeof(*tic), 1);
 	if (tic == NULL)
 		return NULL;
-	tic->rtype = (flags & TIC_COMPAT_V1) ? TERMINFO_RTYPE_O1 :
+	tic->rtype = TERMINFO_RTYPE_O1; /* will promote if needed */
 	    _ti_find_rtype(cap);
 	buf.buf = NULL;
 	buf.buflen = 0;
 	tic->name = _ti_getname(tic->rtype, name);
 	if (tic->name == NULL)
 		goto error;
 	if (alias != NULL && flags & TIC_ALIAS) {
 		tic->alias = _ti_getname(tic->rtype, alias);
 		if (tic->alias == NULL)
 			goto error;
+	}
 	if (desc != NULL && flags & TIC_DESCRIPTION) {
 		tic->desc = strdup(desc);
 @@ -608,26 +684,33 @@ _ti_compile(char *cap, int flags)
 				continue;
 			cnum = strtol(p, &e, 0);
 			if (*e != '\0') {
 				dowarn(flags, "%s: %s: not a number",
 				    tic->name, token);
 				continue;
+			}
 			if (!VALID_NUMERIC(cnum) || cnum > INT32_MAX) {
 				dowarn(flags, "%s: %s: number %ld out of range",
 				    tic->name, token, cnum);
 				continue;
+			}
 			if (cnum > INT16_MAX) {
 				if (flags & TIC_COMPAT_V1)
 					cnum = INT16_MAX;
 				else if (tic->rtype == TERMINFO_RTYPE_O1)
 					if (_ti_promote(tic) == -1)
 						goto error;
+			}
 			num = (int)cnum;
 			if (ind == -1) {
 				if (!_ti_store_extra(tic, 1, token, 'n', -1,
 				    num, NULL, 0, flags))
 					goto error;
 			} else {
 				if (!_ti_encode_buf_id_num(&tic->nums,
 				    ind, num, _ti_numsize(tic)))
 					    goto error;
+			}
 			continue;
+		}

 @@ -1,14 +1,14 @@
-/* $NetBSD: term_private.h,v 1.17 2020/03/29 18:54:57 roy Exp $ */
+/* $NetBSD: term_private.h,v 1.18 2020/03/29 21:46:22 roy Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2013, 2020 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
 @@ -141,49 +141,48 @@ const char *	_ti_flagid(ssize_t);
 const char *	_ti_numid(ssize_t);
 const char *	_ti_strid(ssize_t);
 int		_ti_getterm(TERMINAL *, const char *, int);
 void		_ti_setospeed(TERMINAL *);
 /* libterminfo can compile terminfo strings too */
 #define TIC_WARNING	(1 << 0)
 #define TIC_DESCRIPTION	(1 << 1)
 #define TIC_ALIAS	(1 << 2)
 #define TIC_COMMENT	(1 << 3)
 #define TIC_EXTRA	(1 << 4)
 #define TIC_COMPAT_V1	(1 << 5)
 #define UINT16_T_MAX	0xffff
 typedef struct {
 	char *buf;
 	size_t buflen;
 	size_t bufpos;
 	size_t entries;
 } TBUF;
 typedef struct {
 	char *name;
 	char *alias;
 	char *desc;
 	int  rtype;
 	TBUF flags;
 	TBUF nums;
 	TBUF strs;
 	TBUF extras;
 } TIC;
 #define _ti_numsize(tic) \
     ((tic)->rtype == TERMINFO_RTYPE_O1 ? sizeof(uint16_t) : sizeof(uint32_t))
 int _ti_promote(TIC *);
 char *_ti_grow_tbuf(TBUF *, size_t);
 char *_ti_get_token(char **, char);
 const char *_ti_find_cap(TIC *, TBUF *, char,  short);
 const char *_ti_find_extra(TIC *, TBUF *, const char *);
 char *_ti_getname(int, const char *);
 size_t _ti_store_extra(TIC *, int, const char *, char, char, int,
     const char *, size_t, int);
 TIC *_ti_compile(char *, int);
 ssize_t _ti_flatten(uint8_t **, const TIC *);
 void _ti_freetic(TIC *);
 int _ti_encode_buf_id_num(TBUF *, int, int, size_t);
 int _ti_encode_buf_id_count_str(TBUF *, int, const void *, size_t);