Module Name: src
Committed By: roy
Date: Mon Feb 22 23:05:39 UTC 2010
Modified Files:
src/lib/libterminfo: Makefile curterm.c term.c term_private.h
terminfo.5.in
src/tools/tic: Makefile
src/usr.bin/infocmp: infocmp.c
src/usr.bin/tic: tic.c
Added Files:
src/lib/libterminfo: compile.c
Log Message:
libterminfo can now compile a single terminfo description which allows
$TERMINFO to be a terminfo description as well as a file reference.
This enables the user to modify the terminfo description on read-only
media.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libterminfo/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libterminfo/compile.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/curterm.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libterminfo/term.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libterminfo/term_private.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libterminfo/terminfo.5.in
cvs rdiff -u -r1.3 -r1.4 src/tools/tic/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/infocmp/infocmp.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/tic/tic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/Makefile
diff -u src/lib/libterminfo/Makefile:1.10 src/lib/libterminfo/Makefile:1.11
--- src/lib/libterminfo/Makefile:1.10 Fri Feb 19 13:53:17 2010
+++ src/lib/libterminfo/Makefile Mon Feb 22 23:05:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/19 13:53:17 njoly Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/22 23:05:39 roy Exp $
USE_SHLIBDIR= yes
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${.CURDIR}
SRCS= term.c ti.c setupterm.c curterm.c tparm.c tputs.c
-SRCS+= hash.c
+SRCS+= compile.c hash.c
INCS= term.h
INCSDIR= /usr/include
Index: src/lib/libterminfo/curterm.c
diff -u src/lib/libterminfo/curterm.c:1.3 src/lib/libterminfo/curterm.c:1.4
--- src/lib/libterminfo/curterm.c:1.3 Thu Feb 11 09:34:12 2010
+++ src/lib/libterminfo/curterm.c Mon Feb 22 23:05:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: curterm.c,v 1.3 2010/02/11 09:34:12 roy Exp $ */
+/* $NetBSD: curterm.c,v 1.4 2010/02/22 23:05:39 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: curterm.c,v 1.3 2010/02/11 09:34:12 roy Exp $");
+__RCSID("$NetBSD: curterm.c,v 1.4 2010/02/22 23:05:39 roy Exp $");
#include <assert.h>
#include <stdlib.h>
@@ -89,9 +89,7 @@
int
del_curterm(TERMINAL *oterm)
{
- if (oterm != NULL) {
- _ti_freeterm(oterm);
- free(oterm);
- }
+
+ _ti_freeterm(oterm);
return 0;
}
Index: src/lib/libterminfo/term.c
diff -u src/lib/libterminfo/term.c:1.9 src/lib/libterminfo/term.c:1.10
--- src/lib/libterminfo/term.c:1.9 Fri Feb 12 12:18:33 2010
+++ src/lib/libterminfo/term.c Mon Feb 22 23:05:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.9 2010/02/12 12:18:33 roy Exp $ */
+/* $NetBSD: term.c,v 1.10 2010/02/22 23:05:39 roy Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: term.c,v 1.9 2010/02/12 12:18:33 roy Exp $");
+__RCSID("$NetBSD: term.c,v 1.10 2010/02/22 23:05:39 roy Exp $");
#include <sys/stat.h>
@@ -286,23 +286,41 @@
_ti_findterm(TERMINAL *term, const char *name, int flags)
{
int r;
- char *e, h[PATH_MAX];
+ char *c, *e, h[PATH_MAX];
+ TIC *tic;
+ uint8_t *f;
+ ssize_t len;
_DIAGASSERT(term != NULL);
_DIAGASSERT(name != NULL);
database[0] = '\0';
_ti_database = NULL;
+ r = 0;
- if ((e = getenv("TERMINFO")) != NULL) {
+ if ((e = getenv("TERMINFO")) != NULL && *e != '\0') {
if (e[0] == '/')
return _ti_dbgetterm(term, e, name, flags);
+ c = strdup(e); /* So we don't destroy env */
+ tic = _ti_compile(c, TIC_WARNING | TIC_EXTRA);
+ free(c);
+ if (tic != NULL && strcmp(tic->name, name) == 0) {
+ len = _ti_flatten(&f, tic);
+ if (len != -1) {
+ r = _ti_readterm(term, (char *)f, len, flags);
+ free(f);
+ }
+ }
+ _ti_freetic(tic);
+ if (r == 1) {
+ _ti_database = "$TERMINFO";
+ return r;
+ }
}
if ((e = getenv("TERMINFO_DIRS")) != NULL)
return _ti_dbgettermp(term, e, name, flags);
- r = 0;
if ((e = getenv("HOME")) != NULL) {
snprintf(h, sizeof(h), "%s/.terminfo", e);
r = _ti_dbgetterm(term, h, name, flags);
@@ -323,7 +341,7 @@
r = _ti_findterm(term, name, flags);
if (r == 1)
- return 1;
+ return r;
for (i = 0; i < __arraycount(compiled_terms); i++) {
t = &compiled_terms[i];
@@ -340,16 +358,11 @@
_ti_freeterm(TERMINAL *term)
{
- _DIAGASSERT(term != NULL);
-
- free(term->_area);
- term->_area = NULL;
- free(term->strs);
- term->strs = NULL;
- free(term->nums);
- term->nums = NULL;
- free(term->flags);
- term->flags = NULL;
- free(term->_userdefs);
- term->_userdefs = NULL;
+ if (term != NULL) {
+ free(term->_area);
+ free(term->strs);
+ free(term->nums);
+ free(term->flags);
+ free(term->_userdefs);
+ }
}
Index: src/lib/libterminfo/term_private.h
diff -u src/lib/libterminfo/term_private.h:1.5 src/lib/libterminfo/term_private.h:1.6
--- src/lib/libterminfo/term_private.h:1.5 Thu Feb 11 00:27:09 2010
+++ src/lib/libterminfo/term_private.h Mon Feb 22 23:05:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: term_private.h,v 1.5 2010/02/11 00:27:09 roy Exp $ */
+/* $NetBSD: term_private.h,v 1.6 2010/02/22 23:05:39 roy Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -116,4 +116,38 @@
void _ti_setospeed(TERMINAL *);
void _ti_freeterm(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 UINT16_T_MAX 0xffff
+
+typedef struct tbuf {
+ char *buf;
+ size_t buflen;
+ size_t bufpos;
+ size_t entries;
+} TBUF;
+
+typedef struct tic {
+ char *name;
+ char *alias;
+ char *desc;
+ TBUF flags;
+ TBUF nums;
+ TBUF strs;
+ TBUF extras;
+} TIC;
+
+char *_ti_grow_tbuf(TBUF *, size_t);
+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 *);
#endif
Index: src/lib/libterminfo/terminfo.5.in
diff -u src/lib/libterminfo/terminfo.5.in:1.11 src/lib/libterminfo/terminfo.5.in:1.12
--- src/lib/libterminfo/terminfo.5.in:1.11 Fri Feb 12 10:18:56 2010
+++ src/lib/libterminfo/terminfo.5.in Mon Feb 22 23:05:39 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: terminfo.5.in,v 1.11 2010/02/12 10:18:56 roy Exp $
+.\" $NetBSD: terminfo.5.in,v 1.12 2010/02/22 23:05:39 roy Exp $
.\"
.\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 12, 2010
+.Dd February 22, 2010
.Dt TERMINFO 5
.Os
.Sh NAME
@@ -203,7 +203,14 @@
.Pp
If the environment variable
.Ev TERMINFO
-is available then only this file is searched.
+is available, does not begin with /, can be compiled with the above rules and
+whose name matches
+.Ev TERM
+then it is used.
+.Pp
+If the environment variable
+.Ev TERMINFO
+is available then and begins with / then only this file is searched.
Otherwise
.Nm
will first look for
Index: src/tools/tic/Makefile
diff -u src/tools/tic/Makefile:1.3 src/tools/tic/Makefile:1.4
--- src/tools/tic/Makefile:1.3 Sat Feb 20 19:04:48 2010
+++ src/tools/tic/Makefile Mon Feb 22 23:05:39 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/20 19:04:48 roy Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/22 23:05:39 roy Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}tic
HOST_SRCDIR= usr.bin/tic
-HOST_SRCS= hash.c
+HOST_SRCS= compile.c hash.c
.include "${.CURDIR}/../Makefile.host"
Index: src/usr.bin/infocmp/infocmp.c
diff -u src/usr.bin/infocmp/infocmp.c:1.6 src/usr.bin/infocmp/infocmp.c:1.7
--- src/usr.bin/infocmp/infocmp.c:1.6 Thu Feb 11 14:38:43 2010
+++ src/usr.bin/infocmp/infocmp.c Mon Feb 22 23:05:39 2010
@@ -1,7 +1,7 @@
-/* $NetBSD: infocmp.c,v 1.6 2010/02/11 14:38:43 roy Exp $ */
+/* $NetBSD: infocmp.c,v 1.7 2010/02/22 23:05:39 roy Exp $ */
/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Roy Marples.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: infocmp.c,v 1.6 2010/02/11 14:38:43 roy Exp $");
+__RCSID("$NetBSD: infocmp.c,v 1.7 2010/02/22 23:05:39 roy Exp $");
#include <sys/ioctl.h>
@@ -722,7 +722,8 @@
if (_ti_database == NULL)
printf("internal database\n");
else
- printf("%s.db\n", _ti_database);
+ printf("%s%s\n", _ti_database,
+ *_ti_database == '/' ? ".db" : "");
}
printf("%s", t->name);
if (t->_alias != NULL && *t->_alias != '\0')
Index: src/usr.bin/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.9 src/usr.bin/tic/tic.c:1.10
--- src/usr.bin/tic/tic.c:1.9 Sat Feb 20 06:20:46 2010
+++ src/usr.bin/tic/tic.c Mon Feb 22 23:05:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.9 2010/02/20 06:20:46 pgoyette Exp $ */
+/* $NetBSD: tic.c,v 1.10 2010/02/22 23:05:39 roy Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tic.c,v 1.9 2010/02/20 06:20:46 pgoyette Exp $");
+__RCSID("$NetBSD: tic.c,v 1.10 2010/02/22 23:05:39 roy Exp $");
#include <sys/types.h>
@@ -54,25 +54,6 @@
#include <term_private.h>
#include <term.h>
-#define UINT16_T_MAX 0xffff
-
-typedef struct tbuf {
- char *buf;
- size_t buflen;
- size_t bufpos;
- size_t entries;
-} TBUF;
-
-typedef struct tic {
- char *name;
- char *alias;
- char *desc;
- TBUF flags;
- TBUF nums;
- TBUF strs;
- TBUF extras;
-} TIC;
-
/* We store the full list of terminals we have instead of iterating
through the database as the sequential iterator doesn't work
the the data size stored changes N amount which ours will. */
@@ -80,16 +61,14 @@
struct term *next;
char *name;
char type;
- TIC tic;
+ TIC *tic;
} TERM;
static TERM *terms;
static int error_exit;
-static int Sflag, aflag, xflag;
+static int Sflag;
static char *dbname;
-static TBUF scratch;
-
static void
do_unlink(void)
{
@@ -113,253 +92,31 @@
grow_tbuf(TBUF *tbuf, size_t len)
{
char *buf;
- size_t l;
-
- l = tbuf->bufpos + len;
- if (l > tbuf->buflen) {
- if (tbuf->bufpos == 0) {
- buf = malloc(l);
- if (buf == NULL)
- err(1, "malloc (%zu bytes)", l);
- } else {
- buf = realloc(tbuf->buf, l);
- if (buf == NULL)
- err(1, "realloc (%zu bytes)", l);
- }
- tbuf->buf = buf;
- tbuf->buflen = l;
- }
- return tbuf->buf;
-}
-
-static char *
-find_cap(TBUF *tbuf, char type, short ind)
-{
- size_t n;
- short num;
- char *cap;
-
- cap = tbuf->buf;
- for (n = tbuf->entries; n > 0; n--) {
- num = le16dec(cap);
- cap += sizeof(uint16_t);
- if (num == ind)
- return cap;
- switch (type) {
- case 'f':
- cap++;
- break;
- case 'n':
- cap += sizeof(uint16_t);
- break;
- case 's':
- num = le16dec(cap);
- cap += sizeof(uint16_t);
- cap += num;
- break;
- }
- }
- return NULL;
-}
-static char *
-find_extra(TBUF *tbuf, const char *code)
-{
- size_t n;
- short num;
- char *cap;
-
- cap = tbuf->buf;
- for (n = tbuf->entries; n > 0; n--) {
- num = le16dec(cap);
- cap += sizeof(uint16_t);
- if (strcmp(cap, code) == 0)
- return cap + num;
- cap += num;
- switch (*cap++) {
- case 'f':
- cap++;
- break;
- case 'n':
- cap += sizeof(uint16_t);
- break;
- case 's':
- num = le16dec(cap);
- cap += sizeof(uint16_t);
- cap += num;
- break;
- }
- }
- return NULL;
-}
-
-static size_t
-store_extra(TIC *tic, int wrn, char *id, char type, char flag, short num,
- char *str, size_t strl)
-{
- size_t l;
-
- if (strcmp(id, "use") != 0) {
- if (find_extra(&tic->extras, id) != NULL)
- return 0;
- if (!xflag) {
- if (wrn != 0)
- dowarn("%s: %s: unknown capability",
- tic->name, id);
- return 0;
- }
- }
-
- l = strlen(id) + 1;
- if (l > UINT16_T_MAX) {
- dowarn("%s: %s: cap name is too long", tic->name, id);
- return 0;
- }
-
- grow_tbuf(&tic->extras, l + strl + (sizeof(uint16_t) * 2) + 1);
- le16enc(tic->extras.buf + tic->extras.bufpos, l);
- tic->extras.bufpos += sizeof(uint16_t);
- memcpy(tic->extras.buf + tic->extras.bufpos, id, l);
- tic->extras.bufpos += l;
- tic->extras.buf[tic->extras.bufpos++] = type;
- switch (type) {
- case 'f':
- tic->extras.buf[tic->extras.bufpos++] = flag;
- break;
- case 'n':
- le16enc(tic->extras.buf + tic->extras.bufpos, num);
- tic->extras.bufpos += sizeof(uint16_t);
- break;
- case 's':
- le16enc(tic->extras.buf + tic->extras.bufpos, strl);
- tic->extras.bufpos += sizeof(uint16_t);
- memcpy(tic->extras.buf + tic->extras.bufpos, str, strl);
- tic->extras.bufpos += strl;
- break;
- }
- tic->extras.entries++;
- return 1;
-}
-
-static TBUF *
-flatten_term(TERM *term)
-{
- size_t buflen, len, alen, dlen;
- char *cap;
- TIC *tic;
-
- scratch.bufpos = 0;
- tic = &term->tic;
- len = strlen(tic->name) + 1;
- if (tic->alias == NULL || Sflag)
- alen = 0;
- else
- alen = strlen(tic->alias) + 1;
- if (tic->desc == NULL || Sflag)
- dlen = 0;
- else
- dlen = strlen(tic->desc) + 1;
- buflen = sizeof(char) +
- sizeof(uint16_t) + len +
- sizeof(uint16_t) + alen +
- sizeof(uint16_t) + dlen +
- (sizeof(uint16_t) * 2) + tic->flags.bufpos +
- (sizeof(uint16_t) * 2) + tic->nums.bufpos +
- (sizeof(uint16_t) * 2) + tic->strs.bufpos +
- (sizeof(uint16_t) * 2) + tic->extras.bufpos;
- grow_tbuf(&scratch, buflen);
- cap = scratch.buf;
- if (term->type == 'a')
- *cap++ = 0;
- else
- *cap++ = 2; /* version */
- le16enc(cap, len);
- cap += sizeof(uint16_t);
- memcpy(cap, tic->name, len);
- cap += len;
- if (term->type != 'a') {
- le16enc(cap, alen);
- cap += sizeof(uint16_t);
- if (tic->alias != NULL && !Sflag) {
- memcpy(cap, tic->alias, alen);
- cap += alen;
- }
- le16enc(cap, dlen);
- cap += sizeof(uint16_t);
- if (tic->desc != NULL && !Sflag) {
- memcpy(cap, tic->desc, dlen);
- cap += dlen;
- }
-
- if (tic->flags.entries == 0) {
- le16enc(cap, 0);
- cap += sizeof(uint16_t);
- } else {
- le16enc(cap, (tic->flags.bufpos + sizeof(uint16_t)));
- cap += sizeof(uint16_t);
- le16enc(cap, tic->flags.entries);
- cap += sizeof(uint16_t);
- memcpy(cap, tic->flags.buf, tic->flags.bufpos);
- cap += tic->flags.bufpos;
- }
-
- if (tic->nums.entries == 0) {
- le16enc(cap, 0);
- cap += sizeof(uint16_t);
- } else {
- le16enc(cap, (tic->nums.bufpos + sizeof(uint16_t)));
- cap += sizeof(uint16_t);
- le16enc(cap, tic->nums.entries);
- cap += sizeof(uint16_t);
- memcpy(cap, tic->nums.buf, tic->nums.bufpos);
- cap += tic->nums.bufpos;
- }
-
- if (tic->strs.entries == 0) {
- le16enc(cap, 0);
- cap += sizeof(uint16_t);
- } else {
- le16enc(cap, (tic->strs.bufpos + sizeof(uint16_t)));
- cap += sizeof(uint16_t);
- le16enc(cap, tic->strs.entries);
- cap += sizeof(uint16_t);
- memcpy(cap, tic->strs.buf, tic->strs.bufpos);
- cap += tic->strs.bufpos;
- }
-
- if (tic->extras.entries == 0) {
- le16enc(cap, 0);
- cap += sizeof(uint16_t);
- } else {
- le16enc(cap, (tic->extras.bufpos + sizeof(uint16_t)));
- cap += sizeof(uint16_t);
- le16enc(cap, tic->extras.entries);
- cap += sizeof(uint16_t);
- memcpy(cap, tic->extras.buf, tic->extras.bufpos);
- cap += tic->extras.bufpos;
- }
- }
- scratch.bufpos = cap - scratch.buf;
-
- return &scratch;
+ buf = _ti_grow_tbuf(tbuf, len);
+ if (buf == NULL)
+ err(1, "_ti_grow_tbuf");
+ return buf;
}
static int
save_term(DBM *db, TERM *term)
{
- TBUF *buf;
+ uint8_t *buf;
+ ssize_t len;
datum key, value;
- buf = flatten_term(term);
- if (buf == NULL)
+ len = _ti_flatten(&buf, term->tic);
+ if (len == -1)
return -1;
key.dptr = term->name;
key.dsize = strlen(term->name);
- value.dptr = scratch.buf;
- value.dsize = scratch.bufpos;
+ value.dptr = buf;
+ value.dsize = len;
if (dbm_store(db, key, value, DBM_REPLACE) == -1)
err(1, "dbm_store");
+ free(buf);
return 0;
}
@@ -391,109 +148,10 @@
return term;
}
-static void
-encode_string(const char *term, const char *cap, TBUF *tbuf, const char *str)
-{
- int slash, i, num;
- char ch, *p, *s, last;
-
- grow_tbuf(tbuf, strlen(str) + 1);
- p = s = tbuf->buf + tbuf->bufpos;
- slash = 0;
- last = '\0';
- /* Convert escape codes */
- while ((ch = *str++) != '\0') {
- if (slash == 0 && ch == '\\') {
- slash = 1;
- continue;
- }
- if (slash == 0) {
- if (last != '%' && ch == '^') {
- ch = *str++;
- if (((unsigned char)ch) >= 128)
- dowarn("%s: %s: illegal ^ character",
- term, cap);
- if (ch == '\0')
- break;
- if (ch == '?')
- ch = '\177';
- else if ((ch &= 037) == 0)
- ch = 128;
- }
- *p++ = ch;
- last = ch;
- continue;
- }
- slash = 0;
- if (ch >= '0' && ch <= '7') {
- num = ch - '0';
- for (i = 0; i < 2; i++) {
- if (*str < '0' || *str > '7') {
- if (isdigit((unsigned char)*str))
- dowarn("%s: %s: non octal"
- " digit", term, cap);
- else
- break;
- }
- num = num * 8 + *str++ - '0';
- }
- if (num == 0)
- num = 0200;
- *p++ = (char)num;
- continue;
- }
- switch (ch) {
- case 'a':
- *p++ = '\a';
- break;
- case 'b':
- *p++ = '\b';
- break;
- case 'e': /* FALLTHROUGH */
- case 'E':
- *p++ = '\033';
- break;
- case 'f':
- *p++ = '\014';
- break;
- case 'l': /* FALLTHROUGH */
- case 'n':
- *p++ = '\n';
- break;
- case 'r':
- *p++ = '\r';
- break;
- case 's':
- *p++ = ' ';
- break;
- case 't':
- *p++ = '\t';
- break;
- default:
-
- /* We should warn here */
- case '^':
- case ',':
- case ':':
- case '|':
- *p++ = ch;
- break;
- }
- last = ch;
- }
- *p++ = '\0';
- tbuf->bufpos += p - s;
-}
-
static int
-process_entry(TBUF *buf)
+process_entry(TBUF *buf, int flags)
{
- char *cap, *capstart, *p, *e, *name, *desc, *alias;
- signed char flag;
- long num;
- int slash;
- ssize_t ind;
- size_t len;
+ char *p, *e, *alias;
TERM *term;
TIC *tic;
@@ -507,213 +165,38 @@
if (isspace((unsigned char)*buf->buf))
return 0;
- cap = strchr(buf->buf, '\n');
- if (cap == NULL)
+ tic = _ti_compile(buf->buf, flags);
+ if (tic == NULL)
return 0;
- e = cap - 1;
- if (*e == ',')
- *e = '\0';
- *cap++ = '\0';
-
- name = buf->buf;
- desc = strrchr(buf->buf, '|');
- if (desc != NULL)
- *desc++ = '\0';
- alias = strchr(buf->buf, '|');
- if (alias != NULL)
- *alias++ = '\0';
-
- if (*e != '\0')
- dowarn("%s: description missing separator", buf->buf);
-
- /* If we already have this term, abort */
- if (find_term(name) != NULL) {
- dowarn("%s: duplicate entry", name);
+
+ if (find_term(tic->name) != NULL) {
+ dowarn("%s: duplicate entry", tic->name);
+ _ti_freetic(tic);
return 0;
}
- term = store_term(name, 't');
- tic = &term->tic;
- tic->name = strdup(name);
- if (tic->name == NULL)
- err(1, "malloc");
- if (alias != NULL) {
- tic->alias = strdup(alias);
- if (tic->alias == NULL)
- err(1, "malloc");
- }
- if (desc != NULL) {
- tic->desc = strdup(desc);
- if (tic->desc == NULL)
- err(1, "malloc");
- }
-
- do {
- while (isspace((unsigned char)*cap))
- cap++;
- if (*cap == '\0')
- break;
- slash = 0;
- for (capstart = cap;
- *cap != '\0' && (slash == 1 || *cap != ',');
- cap++)
- {
- if (slash == 0) {
- if (*cap == '\\')
- slash = 1;
- } else
- slash = 0;
- continue;
- }
- *cap++ = '\0';
-
- /* Skip commented caps */
- if (!aflag && capstart[0] == '.')
- continue;
-
- /* Obsolete entries */
- if (capstart[0] == 'O' && capstart[1] == 'T') {
- if (!xflag)
- continue;
- capstart += 2;
- }
-
- /* str cap */
- p = strchr(capstart, '=');
- if (p != NULL) {
- *p++ = '\0';
- /* Don't use the string if we already have it */
- ind = _ti_strindex(capstart);
- if (ind != -1 &&
- find_cap(&tic->strs, 's', ind) != NULL)
- continue;
-
- /* Encode the string to our scratch buffer */
- scratch.bufpos = 0;
- encode_string(tic->name, capstart, &scratch, p);
- if (scratch.bufpos > UINT16_T_MAX) {
- dowarn("%s: %s: string is too long",
- tic->name, capstart);
- continue;
- }
- if (!VALID_STRING(scratch.buf)) {
- dowarn("%s: %s: invalid string",
- tic->name, capstart);
- continue;
- }
-
- if (ind == -1)
- store_extra(tic, 1, capstart, 's', -1, -2,
- scratch.buf, scratch.bufpos);
- else {
- grow_tbuf(&tic->strs, (sizeof(uint16_t) * 2) +
- scratch.bufpos);
- le16enc(tic->strs.buf + tic->strs.bufpos, ind);
- tic->strs.bufpos += sizeof(uint16_t);
- le16enc(tic->strs.buf + tic->strs.bufpos,
- scratch.bufpos);
- tic->strs.bufpos += sizeof(uint16_t);
- memcpy(tic->strs.buf + tic->strs.bufpos,
- scratch.buf, scratch.bufpos);
- tic->strs.bufpos += scratch.bufpos;
- tic->strs.entries++;
- }
- continue;
- }
-
- /* num cap */
- p = strchr(capstart, '#');
- if (p != NULL) {
- *p++ = '\0';
- /* Don't use the number if we already have it */
- ind = _ti_numindex(capstart);
- if (ind != -1 &&
- find_cap(&tic->nums, 'n', ind) != NULL)
- continue;
-
- num = strtol(p, &e, 0);
- if (*e != '\0') {
- dowarn("%s: %s: not a number",
- tic->name, capstart);
- continue;
- }
- if (!VALID_NUMERIC(num)) {
- dowarn("%s: %s: number out of range",
- tic->name, capstart);
- continue;
- }
- if (ind == -1)
- store_extra(tic, 1, capstart, 'n', -1,
- num, NULL, 0);
- else {
- grow_tbuf(&tic->nums, sizeof(uint16_t) * 2);
- le16enc(tic->nums.buf + tic->nums.bufpos, ind);
- tic->nums.bufpos += sizeof(uint16_t);
- le16enc(tic->nums.buf + tic->nums.bufpos, num);
- tic->nums.bufpos += sizeof(uint16_t);
- tic->nums.entries++;
- }
- continue;
- }
-
- flag = 1;
- len = strlen(capstart) - 1;
- if (capstart[len] == '@') {
- flag = CANCELLED_BOOLEAN;
- capstart[len] = '\0';
- }
- ind = _ti_flagindex(capstart);
- if (ind == -1 && flag == CANCELLED_BOOLEAN) {
- if ((ind = _ti_numindex(capstart)) != -1) {
- if (find_cap(&tic->nums, 'n', ind) != NULL)
- continue;
- grow_tbuf(&tic->nums, sizeof(uint16_t) * 2);
- le16enc(tic->nums.buf + tic->nums.bufpos, ind);
- tic->nums.bufpos += sizeof(uint16_t);
- le16enc(tic->nums.buf + tic->nums.bufpos,
- CANCELLED_NUMERIC);
- tic->nums.bufpos += sizeof(uint16_t);
- tic->nums.entries++;
- continue;
- } else if ((ind = _ti_strindex(capstart)) != -1) {
- if (find_cap(&tic->strs, 's', ind) != NULL)
- continue;
- grow_tbuf(&tic->strs,
- (sizeof(uint16_t) * 2) + 1);
- le16enc(tic->strs.buf + tic->strs.bufpos, ind);
- tic->strs.bufpos += sizeof(uint16_t);
- le16enc(tic->strs.buf + tic->strs.bufpos, 0);
- tic->strs.bufpos += sizeof(uint16_t);
- tic->strs.entries++;
- continue;
- }
- }
- if (ind == -1)
- store_extra(tic, 1, capstart, 'f', flag, 0, NULL, 0);
- else if (find_cap(&tic->flags, 'f', ind) == NULL) {
- grow_tbuf(&tic->flags, sizeof(uint16_t) + 1);
- le16enc(tic->flags.buf + tic->flags.bufpos, ind);
- tic->flags.bufpos += sizeof(uint16_t);
- tic->flags.buf[tic->flags.bufpos++] = flag;
- tic->flags.entries++;
- }
- } while (*cap == ',' || isspace((unsigned char)*cap));
+ term = store_term(tic->name, 't');
+ term->tic = tic;
/* Create aliased terms */
- if (alias != NULL) {
- while (alias != NULL && *alias != '\0') {
- desc = strchr(alias, '|');
- if (desc != NULL)
- *desc++ = '\0';
- if (find_term(alias) != NULL) {
+ if (tic->alias != NULL) {
+ alias = p = strdup(tic->alias);
+ while (p != NULL && *p != '\0') {
+ e = strchr(p, '|');
+ if (e != NULL)
+ *e++ = '\0';
+ if (find_term(p) != NULL) {
dowarn("%s: has alias for already assigned"
- " term %s", tic->name, alias);
+ " term %s", tic->name, p);
} else {
- term = store_term(alias, 'a');
- term->tic.name = strdup(tic->name);
- if (term->tic.name == NULL)
+ term = store_term(p, 'a');
+ term->tic = calloc(sizeof(*term->tic), 1);
+ if (term->tic == NULL)
+ err(1, "malloc");
+ term->tic->name = strdup(tic->name);
+ if (term->tic->name == NULL)
err(1, "malloc");
}
- alias = desc;
+ p = e;
}
}
@@ -721,7 +204,7 @@
}
static void
-merge(TIC *rtic, TIC *utic)
+merge(TIC *rtic, TIC *utic, int flags)
{
char *cap, flag, *code, type, *str;
short ind, num;
@@ -733,9 +216,9 @@
cap += sizeof(uint16_t);
flag = *cap++;
if (VALID_BOOLEAN(flag) &&
- find_cap(&rtic->flags, 'f', ind) == NULL)
+ _ti_find_cap(&rtic->flags, 'f', ind) == NULL)
{
- grow_tbuf(&rtic->flags, sizeof(uint16_t) + 1);
+ _ti_grow_tbuf(&rtic->flags, sizeof(uint16_t) + 1);
le16enc(rtic->flags.buf + rtic->flags.bufpos, ind);
rtic->flags.bufpos += sizeof(uint16_t);
rtic->flags.buf[rtic->flags.bufpos++] = flag;
@@ -750,7 +233,7 @@
num = le16dec(cap);
cap += sizeof(uint16_t);
if (VALID_NUMERIC(num) &&
- find_cap(&rtic->nums, 'n', ind) == NULL)
+ _ti_find_cap(&rtic->nums, 'n', ind) == NULL)
{
grow_tbuf(&rtic->nums, sizeof(uint16_t) * 2);
le16enc(rtic->nums.buf + rtic->nums.bufpos, ind);
@@ -768,7 +251,7 @@
num = le16dec(cap);
cap += sizeof(uint16_t);
if (num > 0 &&
- find_cap(&rtic->strs, 's', ind) == NULL)
+ _ti_find_cap(&rtic->strs, 's', ind) == NULL)
{
grow_tbuf(&rtic->strs, (sizeof(uint16_t) * 2) + num);
le16enc(rtic->strs.buf + rtic->strs.bufpos, ind);
@@ -813,12 +296,13 @@
continue;
break;
}
- store_extra(rtic, 0, code, type, flag, num, str, num);
+ _ti_store_extra(rtic, 0, code, type, flag, num, str, num,
+ flags);
}
}
static size_t
-merge_use(void)
+merge_use(int flags)
{
size_t skipped, merged, memn;
char *cap, *scap;
@@ -830,8 +314,8 @@
for (term = terms; term != NULL; term = term->next) {
if (term->type == 'a')
continue;
- rtic = &term->tic;
- while ((cap = find_extra(&rtic->extras, "use")) != NULL) {
+ rtic = term->tic;
+ while ((cap = _ti_find_extra(&rtic->extras, "use")) != NULL) {
if (*cap++ != 's') {
dowarn("%s: use is not string", rtic->name);
break;
@@ -843,26 +327,26 @@
}
uterm = find_term(cap);
if (uterm != NULL && uterm->type == 'a')
- uterm = find_term(uterm->tic.name);
+ uterm = find_term(uterm->tic->name);
if (uterm == NULL) {
dowarn("%s: no use record for %s",
rtic->name, cap);
goto remove;
}
- utic = &uterm->tic;
+ utic = uterm->tic;
if (strcmp(utic->name, rtic->name) == 0) {
dowarn("%s: uses itself", rtic->name);
goto remove;
}
- if (find_extra(&utic->extras, "use") != NULL) {
+ if (_ti_find_extra(&utic->extras, "use") != NULL) {
skipped++;
break;
}
- cap = find_extra(&rtic->extras, "use");
- merge(rtic, utic);
+ cap = _ti_find_extra(&rtic->extras, "use");
+ merge(rtic, utic, flags);
remove:
/* The pointers may have changed, find the use again */
- cap = find_extra(&rtic->extras, "use");
+ cap = _ti_find_extra(&rtic->extras, "use");
if (cap == NULL)
dowarn("%s: use no longer exists - impossible",
rtic->name);
@@ -891,9 +375,10 @@
print_dump(int argc, char **argv)
{
TERM *term;
- TBUF *buf;
+ uint8_t *buf;
int i, n;
size_t j, col;
+ ssize_t len;
printf("struct compiled_term {\n");
printf("\tconst char *name;\n");
@@ -914,33 +399,37 @@
warnx("%s: cannot dump alias", argv[i]);
continue;
}
- buf = flatten_term(term);
- if (buf == NULL)
+ /* Don't compile the aliases in, save space */
+ free(term->tic->alias);
+ term->tic->alias = NULL;
+ len = _ti_flatten(&buf, term->tic);
+ if (len == 0 || len == -1)
continue;
printf("\t{\n");
printf("\t\t\"%s\",\n", argv[i]);
n++;
- for (j = 0, col = 0; j < buf->bufpos; j++) {
+ for (j = 0, col = 0; j < (size_t)len; j++) {
if (col == 0) {
printf("\t\t\"");
col = 16;
}
- col += printf("\\%03o", (uint8_t)buf->buf[j]);
+ col += printf("\\%03o", (uint8_t)buf[j]);
if (col > 75) {
printf("\"%s\n",
- j + 1 == buf->bufpos ? "," : "");
+ j + 1 == (size_t)len ? "," : "");
col = 0;
}
}
if (col != 0)
printf("\",\n");
- printf("\t\t%zu\n", buf->bufpos);
+ printf("\t\t%zu\n", len);
printf("\t}");
if (i + 1 < argc)
printf(",");
printf("\n");
+ free(buf);
}
printf("};\n");
@@ -950,7 +439,7 @@
int
main(int argc, char **argv)
{
- int ch, cflag, sflag;
+ int ch, cflag, sflag, flags;
char *source, *p, *buf, *ofile;
FILE *f;
DBM *db;
@@ -960,13 +449,17 @@
cflag = sflag = 0;
ofile = NULL;
+ flags = TIC_ALIAS | TIC_DESCRIPTION | TIC_WARNING;
while ((ch = getopt(argc, argv, "Saco:sx")) != -1)
switch (ch) {
case 'S':
Sflag = 1;
+ /* We still compile aliases so that use= works.
+ * However, it's removed before we flatten to save space. */
+ flags &= ~TIC_DESCRIPTION;
break;
case 'a':
- aflag = 1;
+ flags |= TIC_COMMENT;
break;
case 'c':
cflag = 1;
@@ -978,7 +471,7 @@
sflag = 1;
break;
case 'x':
- xflag = 1;
+ flags |= TIC_EXTRA;
break;
case '?': /* FALLTHROUGH */
default:
@@ -1019,7 +512,7 @@
if (*buf == '#')
continue;
if (buf[buflen - 1] != '\n') {
- process_entry(&tbuf);
+ process_entry(&tbuf, flags);
dowarn("last line is not a comment"
" and does not end with a newline");
continue;
@@ -1029,7 +522,7 @@
new entry, so process it.
*/
if (!isspace((unsigned char)*buf) && tbuf.bufpos != 0)
- process_entry(&tbuf);
+ process_entry(&tbuf, flags);
/* Grow the buffer if needed */
grow_tbuf(&tbuf, buflen);
@@ -1038,10 +531,10 @@
tbuf.bufpos += buflen;
}
/* Process the last entry if not done already */
- process_entry(&tbuf);
+ process_entry(&tbuf, flags);
/* Merge use entries until we have merged all we can */
- while (merge_use() != 0)
+ while (merge_use(flags) != 0)
;
if (Sflag) {
Added files:
Index: src/lib/libterminfo/compile.c
diff -u /dev/null src/lib/libterminfo/compile.c:1.1
--- /dev/null Mon Feb 22 23:05:40 2010
+++ src/lib/libterminfo/compile.c Mon Feb 22 23:05:39 2010
@@ -0,0 +1,652 @@
+/* $NetBSD: compile.c,v 1.1 2010/02/22 23:05:39 roy 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
+ * 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.
+ */
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: compile.c,v 1.1 2010/02/22 23:05:39 roy Exp $");
+
+#include <assert.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <term_private.h>
+#include <term.h>
+
+static void __attribute__((__format__(__printf__, 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);
+ }
+}
+
+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)
+ 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)
+{
+ size_t n;
+ short num;
+ char *cap;
+
+ _DIAGASSERT(tbuf != NULL);
+
+ cap = tbuf->buf;
+ for (n = tbuf->entries; n > 0; n--) {
+ num = le16dec(cap);
+ cap += sizeof(uint16_t);
+ if (num == ind)
+ return cap;
+ switch (type) {
+ case 'f':
+ cap++;
+ break;
+ case 'n':
+ cap += sizeof(uint16_t);
+ break;
+ case 's':
+ num = le16dec(cap);
+ cap += sizeof(uint16_t);
+ cap += num;
+ break;
+ }
+ }
+
+ errno = ESRCH;
+ return NULL;
+}
+
+char *
+_ti_find_extra(TBUF *tbuf, const char *code)
+{
+ size_t n;
+ short num;
+ char *cap;
+
+ _DIAGASSERT(tbuf != NULL);
+ _DIAGASSERT(code != NULL);
+
+ cap = tbuf->buf;
+ for (n = tbuf->entries; n > 0; n--) {
+ num = le16dec(cap);
+ cap += sizeof(uint16_t);
+ if (strcmp(cap, code) == 0)
+ return cap + num;
+ cap += num;
+ switch (*cap++) {
+ case 'f':
+ cap++;
+ break;
+ case 'n':
+ cap += sizeof(uint16_t);
+ break;
+ case 's':
+ num = le16dec(cap);
+ cap += sizeof(uint16_t);
+ cap += num;
+ break;
+ }
+ }
+
+ errno = ESRCH;
+ return NULL;
+}
+
+size_t
+_ti_store_extra(TIC *tic, int wrn, char *id, char type, char flag, short num,
+ char *str, size_t strl, int flags)
+{
+ size_t l;
+
+ _DIAGASSERT(tic != NULL);
+
+ if (strcmp(id, "use") != 0) {
+ if (_ti_find_extra(&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) {
+ dowarn(flags, "%s: %s: cap name is too long", tic->name, id);
+ return 0;
+ }
+
+ if (!_ti_grow_tbuf(&tic->extras,
+ l + strl + (sizeof(uint16_t) * 2) + 1))
+ return 0;
+ le16enc(tic->extras.buf + tic->extras.bufpos, l);
+ tic->extras.bufpos += sizeof(uint16_t);
+ memcpy(tic->extras.buf + tic->extras.bufpos, id, l);
+ tic->extras.bufpos += l;
+ tic->extras.buf[tic->extras.bufpos++] = type;
+ switch (type) {
+ case 'f':
+ tic->extras.buf[tic->extras.bufpos++] = flag;
+ break;
+ case 'n':
+ le16enc(tic->extras.buf + tic->extras.bufpos, num);
+ tic->extras.bufpos += sizeof(uint16_t);
+ break;
+ case 's':
+ le16enc(tic->extras.buf + tic->extras.bufpos, strl);
+ tic->extras.bufpos += sizeof(uint16_t);
+ memcpy(tic->extras.buf + tic->extras.bufpos, str, strl);
+ tic->extras.bufpos += strl;
+ break;
+ }
+ tic->extras.entries++;
+ return 1;
+}
+
+ssize_t
+_ti_flatten(uint8_t **buf, const TIC *tic)
+{
+ size_t buflen, len, alen, dlen;
+ uint8_t *cap;
+
+ _DIAGASSERT(buf != NULL);
+ _DIAGASSERT(tic != NULL);
+
+ len = strlen(tic->name) + 1;
+ if (tic->alias == NULL)
+ alen = 0;
+ else
+ alen = strlen(tic->alias) + 1;
+ if (tic->desc == NULL)
+ dlen = 0;
+ else
+ dlen = strlen(tic->desc) + 1;
+ buflen = sizeof(char) +
+ sizeof(uint16_t) + len +
+ sizeof(uint16_t) + alen +
+ sizeof(uint16_t) + dlen +
+ (sizeof(uint16_t) * 2) + tic->flags.bufpos +
+ (sizeof(uint16_t) * 2) + tic->nums.bufpos +
+ (sizeof(uint16_t) * 2) + tic->strs.bufpos +
+ (sizeof(uint16_t) * 2) + tic->extras.bufpos;
+ *buf = malloc(buflen);
+ if (*buf == NULL)
+ return -1;
+
+ cap = *buf;
+ *cap++ = 2; /* version */
+ le16enc(cap, len);
+ cap += sizeof(uint16_t);
+ memcpy(cap, tic->name, len);
+ cap += len;
+
+ le16enc(cap, alen);
+ cap += sizeof(uint16_t);
+ if (tic->alias != NULL) {
+ memcpy(cap, tic->alias, alen);
+ cap += alen;
+ }
+ le16enc(cap, dlen);
+ cap += sizeof(uint16_t);
+ if (tic->desc != NULL) {
+ memcpy(cap, tic->desc, dlen);
+ cap += dlen;
+ }
+
+ if (tic->flags.entries == 0) {
+ le16enc(cap, 0);
+ cap += sizeof(uint16_t);
+ } else {
+ le16enc(cap, (tic->flags.bufpos + sizeof(uint16_t)));
+ cap += sizeof(uint16_t);
+ le16enc(cap, tic->flags.entries);
+ cap += sizeof(uint16_t);
+ memcpy(cap, tic->flags.buf, tic->flags.bufpos);
+ cap += tic->flags.bufpos;
+ }
+
+ if (tic->nums.entries == 0) {
+ le16enc(cap, 0);
+ cap += sizeof(uint16_t);
+ } else {
+ le16enc(cap, (tic->nums.bufpos + sizeof(uint16_t)));
+ cap += sizeof(uint16_t);
+ le16enc(cap, tic->nums.entries);
+ cap += sizeof(uint16_t);
+ memcpy(cap, tic->nums.buf, tic->nums.bufpos);
+ cap += tic->nums.bufpos;
+ }
+
+ if (tic->strs.entries == 0) {
+ le16enc(cap, 0);
+ cap += sizeof(uint16_t);
+ } else {
+ le16enc(cap, (tic->strs.bufpos + sizeof(uint16_t)));
+ cap += sizeof(uint16_t);
+ le16enc(cap, tic->strs.entries);
+ cap += sizeof(uint16_t);
+ memcpy(cap, tic->strs.buf, tic->strs.bufpos);
+ cap += tic->strs.bufpos;
+ }
+
+ if (tic->extras.entries == 0) {
+ le16enc(cap, 0);
+ cap += sizeof(uint16_t);
+ } else {
+ le16enc(cap, (tic->extras.bufpos + sizeof(uint16_t)));
+ cap += sizeof(uint16_t);
+ le16enc(cap, tic->extras.entries);
+ cap += sizeof(uint16_t);
+ memcpy(cap, tic->extras.buf, tic->extras.bufpos);
+ cap += tic->extras.bufpos;
+ }
+
+ return cap - *buf;
+}
+
+static int
+encode_string(const char *term, const char *cap, TBUF *tbuf, const char *str,
+ int flags)
+{
+ int slash, i, num;
+ char ch, *p, *s, last;
+
+ if (_ti_grow_tbuf(tbuf, strlen(str) + 1) == NULL)
+ return -1;
+ p = s = tbuf->buf + tbuf->bufpos;
+ slash = 0;
+ last = '\0';
+ /* Convert escape codes */
+ while ((ch = *str++) != '\0') {
+ if (slash == 0 && ch == '\\') {
+ slash = 1;
+ continue;
+ }
+ if (slash == 0) {
+ if (last != '%' && ch == '^') {
+ ch = *str++;
+ if (((unsigned char)ch) >= 128)
+ dowarn(flags,
+ "%s: %s: illegal ^ character",
+ term, cap);
+ if (ch == '\0')
+ break;
+ if (ch == '?')
+ ch = '\177';
+ else if ((ch &= 037) == 0)
+ ch = 128;
+ }
+ *p++ = ch;
+ last = ch;
+ continue;
+ }
+ slash = 0;
+ if (ch >= '0' && ch <= '7') {
+ num = ch - '0';
+ for (i = 0; i < 2; i++) {
+ if (*str < '0' || *str > '7') {
+ if (isdigit((unsigned char)*str))
+ dowarn(flags,
+ "%s: %s: non octal"
+ " digit", term, cap);
+ else
+ break;
+ }
+ num = num * 8 + *str++ - '0';
+ }
+ if (num == 0)
+ num = 0200;
+ *p++ = (char)num;
+ continue;
+ }
+ switch (ch) {
+ case 'a':
+ *p++ = '\a';
+ break;
+ case 'b':
+ *p++ = '\b';
+ break;
+ case 'e': /* FALLTHROUGH */
+ case 'E':
+ *p++ = '\033';
+ break;
+ case 'f':
+ *p++ = '\014';
+ break;
+ case 'l': /* FALLTHROUGH */
+ case 'n':
+ *p++ = '\n';
+ break;
+ case 'r':
+ *p++ = '\r';
+ break;
+ case 's':
+ *p++ = ' ';
+ break;
+ case 't':
+ *p++ = '\t';
+ break;
+ default:
+
+ /* We should warn here */
+ case '^':
+ case ',':
+ case ':':
+ case '|':
+ *p++ = ch;
+ break;
+ }
+ last = ch;
+ }
+ *p++ = '\0';
+ tbuf->bufpos += p - s;
+ return 0;
+}
+
+static char *
+get_token(char **cap)
+{
+ char *token;
+ int esc;
+
+ while (isspace((unsigned char)**cap))
+ (*cap)++;
+ if (**cap == '\0')
+ return NULL;
+
+ /* We can't use stresep(3) as ^ we need two escape chars */
+ esc = 0;
+ for (token = *cap;
+ **cap != '\0' && (esc == 1 || **cap != ',');
+ (*cap)++)
+ {
+ if (esc == 0) {
+ if (**cap == '\\' || **cap == '^')
+ esc = 1;
+ } else
+ esc = 0;
+ }
+
+ if (**cap != '\0')
+ *(*cap)++ = '\0';
+
+ return token;
+}
+
+TIC *
+_ti_compile(char *cap, int flags)
+{
+ char *token, *p, *e, *name, *desc, *alias;
+ signed char flag;
+ long num;
+ ssize_t ind;
+ size_t len;
+ TBUF buf;
+ TIC *tic;
+
+ _DIAGASSERT(cap != NULL);
+
+ name = get_token(&cap);
+ if (name == NULL) {
+ dowarn(flags, "no seperator found: %s", cap);
+ return NULL;
+ }
+ desc = strrchr(name, '|');
+ if (desc != NULL)
+ *desc++ = '\0';
+ alias = strchr(name, '|');
+ if (alias != NULL)
+ *alias++ = '\0';
+
+ tic = calloc(sizeof(*tic), 1);
+ if (tic == NULL)
+ return NULL;
+
+ buf.buf = NULL;
+ buf.buflen = 0;
+
+ tic->name = strdup(name);
+ if (tic->name == NULL)
+ goto error;
+ if (alias != NULL && flags & TIC_ALIAS) {
+ tic->alias = strdup(alias);
+ if (tic->alias == NULL)
+ goto error;
+ }
+ if (desc != NULL && flags & TIC_DESCRIPTION) {
+ tic->desc = strdup(desc);
+ if (tic->desc == NULL)
+ goto error;
+ }
+
+ for (token = get_token(&cap);
+ token != NULL && *token != '\0';
+ token = get_token(&cap))
+ {
+ /* Skip commented caps */
+ if (!(flags & TIC_COMMENT) && token[0] == '.')
+ continue;
+
+ /* Obsolete entries */
+ if (token[0] == 'O' && token[1] == 'T') {
+ if (!(flags & TIC_EXTRA))
+ continue;
+ token += 2;
+ }
+
+ /* str cap */
+ p = strchr(token, '=');
+ if (p != NULL) {
+ *p++ = '\0';
+ /* Don't use the string if we already have it */
+ ind = _ti_strindex(token);
+ if (ind != -1 &&
+ _ti_find_cap(&tic->strs, 's', ind) != NULL)
+ continue;
+
+ /* Encode the string to our scratch buffer */
+ buf.bufpos = 0;
+ if (encode_string(tic->name, token,
+ &buf, p, flags) == -1)
+ goto error;
+ if (buf.bufpos > UINT16_T_MAX) {
+ dowarn(flags, "%s: %s: string is too long",
+ tic->name, token);
+ continue;
+ }
+ if (!VALID_STRING(buf.buf)) {
+ dowarn(flags, "%s: %s: invalid string",
+ tic->name, token);
+ continue;
+ }
+
+ if (ind == -1)
+ _ti_store_extra(tic, 1, token, 's', -1, -2,
+ buf.buf, buf.bufpos, flags);
+ else {
+ if (!_ti_grow_tbuf(&tic->strs,
+ (sizeof(uint16_t) * 2) + buf.bufpos))
+ goto error;
+ le16enc(tic->strs.buf + tic->strs.bufpos, ind);
+ tic->strs.bufpos += sizeof(uint16_t);
+ le16enc(tic->strs.buf + tic->strs.bufpos,
+ buf.bufpos);
+ tic->strs.bufpos += sizeof(uint16_t);
+ memcpy(tic->strs.buf + tic->strs.bufpos,
+ buf.buf, buf.bufpos);
+ tic->strs.bufpos += buf.bufpos;
+ tic->strs.entries++;
+ }
+ continue;
+ }
+
+ /* num cap */
+ p = strchr(token, '#');
+ if (p != NULL) {
+ *p++ = '\0';
+ /* Don't use the number if we already have it */
+ ind = _ti_numindex(token);
+ if (ind != -1 &&
+ _ti_find_cap(&tic->nums, 'n', ind) != NULL)
+ continue;
+
+ num = strtol(p, &e, 0);
+ if (*e != '\0') {
+ dowarn(flags, "%s: %s: not a number",
+ tic->name, token);
+ continue;
+ }
+ if (!VALID_NUMERIC(num)) {
+ dowarn(flags, "%s: %s: number out of range",
+ tic->name, token);
+ continue;
+ }
+ if (ind == -1)
+ _ti_store_extra(tic, 1, token, 'n', -1,
+ num, NULL, 0, flags);
+ else {
+ if (_ti_grow_tbuf(&tic->nums,
+ sizeof(uint16_t) * 2) == NULL)
+ goto error;
+ le16enc(tic->nums.buf + tic->nums.bufpos, ind);
+ tic->nums.bufpos += sizeof(uint16_t);
+ le16enc(tic->nums.buf + tic->nums.bufpos, num);
+ tic->nums.bufpos += sizeof(uint16_t);
+ tic->nums.entries++;
+ }
+ continue;
+ }
+
+ flag = 1;
+ len = strlen(token) - 1;
+ if (token[len] == '@') {
+ flag = CANCELLED_BOOLEAN;
+ token[len] = '\0';
+ }
+ ind = _ti_flagindex(token);
+ if (ind == -1 && flag == CANCELLED_BOOLEAN) {
+ if ((ind = _ti_numindex(token)) != -1) {
+ if (_ti_find_cap(&tic->nums, 'n', ind) != NULL)
+ continue;
+ if (_ti_grow_tbuf(&tic->nums,
+ sizeof(uint16_t) * 2) == NULL)
+ goto error;
+ le16enc(tic->nums.buf + tic->nums.bufpos, ind);
+ tic->nums.bufpos += sizeof(uint16_t);
+ le16enc(tic->nums.buf + tic->nums.bufpos,
+ CANCELLED_NUMERIC);
+ tic->nums.bufpos += sizeof(uint16_t);
+ tic->nums.entries++;
+ continue;
+ } else if ((ind = _ti_strindex(token)) != -1) {
+ if (_ti_find_cap(&tic->strs, 's', ind) != NULL)
+ continue;
+ if (_ti_grow_tbuf(&tic->strs,
+ (sizeof(uint16_t) * 2) + 1) == NULL)
+ goto error;
+ le16enc(tic->strs.buf + tic->strs.bufpos, ind);
+ tic->strs.bufpos += sizeof(uint16_t);
+ le16enc(tic->strs.buf + tic->strs.bufpos, 0);
+ tic->strs.bufpos += sizeof(uint16_t);
+ tic->strs.entries++;
+ continue;
+ }
+ }
+ if (ind == -1)
+ _ti_store_extra(tic, 1, token, 'f', flag, 0, NULL, 0,
+ flags);
+ else if (_ti_find_cap(&tic->flags, 'f', ind) == NULL) {
+ if (_ti_grow_tbuf(&tic->flags, sizeof(uint16_t) + 1)
+ == NULL)
+ goto error;
+ le16enc(tic->flags.buf + tic->flags.bufpos, ind);
+ tic->flags.bufpos += sizeof(uint16_t);
+ tic->flags.buf[tic->flags.bufpos++] = flag;
+ tic->flags.entries++;
+ }
+ }
+
+ free(buf.buf);
+ return tic;
+
+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->flags.buf);
+ free(tic->nums.buf);
+ free(tic->strs.buf);
+ free(tic);
+ }
+}
