 @@ -1,14 +1,14 @@
-/* $NetBSD: compile.c,v 1.6 2011/11/28 12:44:19 joerg Exp $ */
+/* $NetBSD: compile.c,v 1.7 2012/06/01 12:08:40 joerg Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 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.6 2011/11/28 12:44:19 joerg Exp $");
+__RCSID("$NetBSD: compile.c,v 1.7 2012/06/01 12:08:40 joerg 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>
 @@ -64,27 +64,27 @@ dowarn(int flags, const char *fmt, ...)
+	}
+}
 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->bufpos == 0)
+		if (tbuf->buflen == 0)
 			buf = malloc(l);
 		else
 			buf = realloc(tbuf->buf, l);
 		if (buf == NULL)
 			return NULL;
 		tbuf->buf = buf;
 		tbuf->buflen = l;
+	}
 	return tbuf->buf;
+}
 char *
 _ti_find_cap(TBUF *tbuf, char type, short ind)
 @@ -649,19 +649,20 @@ error:
 	free(buf.buf);
 	_ti_freetic(tic);
 	return NULL;
+}
 void
 _ti_freetic(TIC *tic)
+{
 	if (tic != NULL) {
 		free(tic->name);
 		free(tic->alias);
 		free(tic->desc);
 		free(tic->extras.buf);
 		free(tic->flags.buf);
 		free(tic->nums.buf);
 		free(tic->strs.buf);
 		free(tic);
+	}
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: tic.c,v 1.18 2012/05/31 21:01:06 joerg Exp $ */
+/* $NetBSD: tic.c,v 1.19 2012/06/01 12:08:40 joerg Exp $ */
 /*
  * Copyright (c) 2009, 2010 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: tic.c,v 1.18 2012/05/31 21:01:06 joerg Exp $");
+__RCSID("$NetBSD: tic.c,v 1.19 2012/06/01 12:08:40 joerg Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 #if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
 #endif
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
 #include <limits.h>
 @@ -195,26 +195,27 @@ process_entry(TBUF *buf, int flags)
 			e = strchr(p, '|');
 			if (e != NULL)
 				*e++ = '\0';
 			if (find_term(p) != NULL) {
 				dowarn("%s: has alias for already assigned"
 				    " term %s", tic->name, p);
 			} else {
 				term = store_term(p, 'a');
 				term->tic = ecalloc(sizeof(*term->tic), 1);
 				term->tic->name = estrdup(tic->name);
+			}
 			p = e;
+		}
 		free(alias);
+	}
 	return 0;
+}
 static void
 merge(TIC *rtic, TIC *utic, int flags)
+{
 	char *cap, flag, *code, type, *str;
 	short ind, num;
 	size_t n;
 	cap = utic->flags.buf;
 @@ -504,53 +505,55 @@ main(int argc, char **argv)
 		if (db == NULL)
 			err(1, "dbopen: %s", source);
 		p = dbname + strlen(dbname);
 		*p++ = '.';
 		*p++ = 'd';
 		*p++ = 'b';
 		*p++ = '\0';
 		atexit(do_unlink);
 	} else
 		db = NULL; /* satisfy gcc warning */
 	hcreate(HASH_SIZE);
-	buf = NULL;
+	buf = tbuf.buf = NULL;
 	buflen = tbuf.buflen = tbuf.bufpos = 0;
 	while ((len = getline(&buf, &buflen, f)) != -1) {
 		/* Skip comments */
 		if (*buf == '#')
 			continue;
 		if (buf[len - 1] != '\n') {
 			process_entry(&tbuf, flags);
 			dowarn("last line is not a comment"
 			    " and does not end with a newline");
 			continue;
+		}
 		/*
 		  If the first char is space not a space then we have a
 		  new entry, so process it.
 		*/
 		if (!isspace((unsigned char)*buf) && tbuf.bufpos != 0)
 			process_entry(&tbuf, flags);
 		/* Grow the buffer if needed */
 		grow_tbuf(&tbuf, len);
 		/* Append the string */
 		memcpy(tbuf.buf + tbuf.bufpos, buf, len);
 		tbuf.bufpos += len;
+	}
 	free(buf);
 	/* Process the last entry if not done already */
 	process_entry(&tbuf, flags);
 	free(tbuf.buf);
 	/* Merge use entries until we have merged all we can */
 	while (merge_use(flags) != 0)
+		;
 	if (Sflag) {
 		print_dump(argc - optind, argv + optind);
 		return error_exit;
+	}
 	if (cflag)
 		return error_exit;
 @@ -561,19 +564,28 @@ main(int argc, char **argv)
 	/* done! */
 	dbm_close(db);
 	/* Rename the tmp db to the real one now */
 	easprintf(&p, "%s.db", ofile);
 	if (rename(dbname, p) == -1)
 		err(1, "rename");
 	free(dbname);
 	dbname = NULL;
 	if (sflag != 0)
 		fprintf(stderr, "%zu entries and %zu aliases written to %s\n",
 		    nterm, nalias, p);
 	free(p);
 #ifdef __VALGRIND__
 	free(p);
 	while ((term = SLIST_FIRST(&terms)) != NULL) {
 		SLIST_REMOVE_HEAD(&terms, next);
 		_ti_freetic(term->tic);
 		free(term->name);
 		free(term);
+	}
 	hdestroy();
 #endif
 	return EXIT_SUCCESS;
+}