aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/progs/infocmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ncurses/progs/infocmp.c')
-rw-r--r--contrib/ncurses/progs/infocmp.c537
1 files changed, 333 insertions, 204 deletions
diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c
index 69f00ae674a2..d3353f26415e 100644
--- a/contrib/ncurses/progs/infocmp.c
+++ b/contrib/ncurses/progs/infocmp.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -29,6 +29,7 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
+ * and: Thomas E. Dickey 1996-on *
****************************************************************************/
/*
@@ -38,10 +39,9 @@
#include <progs.priv.h>
-#include <term_entry.h>
#include <dump_entry.h>
-MODULE_ID("$Id: infocmp.c,v 1.63 2001/09/22 19:57:40 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.85 2006/08/19 21:20:37 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
@@ -66,6 +66,7 @@ static int termcount; /* count of terminal entries */
static bool limited = TRUE; /* "-r" option is not set */
static bool quiet = FALSE;
+static bool literal = FALSE;
static const char *bool_sep = ":";
static const char *s_absent = "NULL";
static const char *s_cancel = "NULL";
@@ -87,11 +88,10 @@ static bool ignorepads; /* ignore pad prefixes when diffing */
#if NO_LEAKS
#undef ExitProgram
-static void
-ExitProgram(int code) GCC_NORETURN;
+static void ExitProgram(int code) GCC_NORETURN;
/* prototype is to get gcc to accept the noreturn attribute */
- static void
- ExitProgram(int code)
+static void
+ExitProgram(int code)
{
while (termcount-- > 0)
_nc_free_termtype(&entries[termcount].tterm);
@@ -120,7 +120,7 @@ canonical_name(char *ptr, char *buf)
***************************************************************************/
static int
-capcmp(int idx, const char *s, const char *t)
+capcmp(PredIdx idx, const char *s, const char *t)
/* capability comparison function */
{
if (!VALID_STRING(s) && !VALID_STRING(t))
@@ -135,7 +135,7 @@ capcmp(int idx, const char *s, const char *t)
}
static int
-use_predicate(int type, int idx)
+use_predicate(unsigned type, PredIdx idx)
/* predicate function to use for use decompilation */
{
ENTRY *ep;
@@ -245,10 +245,10 @@ useeq(ENTRY * e1, ENTRY * e2)
}
static bool
-entryeq(TERMTYPE * t1, TERMTYPE * t2)
+entryeq(TERMTYPE *t1, TERMTYPE *t2)
/* are two entries equivalent? */
{
- int i;
+ unsigned i;
for (i = 0; i < NUM_BOOLEANS(t1); i++)
if (t1->Booleans[i] != t2->Booleans[i])
@@ -259,7 +259,7 @@ entryeq(TERMTYPE * t1, TERMTYPE * t2)
return (FALSE);
for (i = 0; i < NUM_STRINGS(t1); i++)
- if (capcmp(i, t1->Strings[i], t2->Strings[i]))
+ if (capcmp((PredIdx) i, t1->Strings[i], t2->Strings[i]))
return (FALSE);
return (TRUE);
@@ -268,7 +268,7 @@ entryeq(TERMTYPE * t1, TERMTYPE * t2)
#define TIC_EXPAND(result) _nc_tic_expand(result, outform==F_TERMINFO, numbers)
static void
-print_uses(ENTRY * ep, FILE * fp)
+print_uses(ENTRY * ep, FILE *fp)
/* print an entry's use references */
{
int i;
@@ -332,7 +332,7 @@ dump_string(char *val, char *buf)
}
static void
-compare_predicate(int type, int idx, const char *name)
+compare_predicate(PredType type, PredIdx idx, const char *name)
/* predicate function to use for entry difference reports */
{
register ENTRY *e1 = &entries[0];
@@ -474,14 +474,26 @@ static const assoc std_caps[] =
{"\033)A", "ISO UK G1"}, /* enable UK chars for G1 */
{"\033)B", "ISO US G1"}, /* enable US chars for G1 */
- /* these are DEC private modes widely supported by emulators */
+ /* these are DEC private controls widely supported by emulators */
{"\033=", "DECPAM"}, /* application keypad mode */
{"\033>", "DECPNM"}, /* normal keypad mode */
{"\033<", "DECANSI"}, /* enter ANSI mode */
+ {"\033[!p", "DECSTR"}, /* soft reset */
+ {"\033 F", "S7C1T"}, /* 7-bit controls */
{(char *) 0, (char *) 0}
};
+static const assoc std_modes[] =
+/* ECMA \E[ ... [hl] modes recognized by many emulators */
+{
+ {"2", "AM"}, /* keyboard action mode */
+ {"4", "IRM"}, /* insert/replace mode */
+ {"12", "SRM"}, /* send/receive mode */
+ {"20", "LNM"}, /* linefeed mode */
+ {(char *) 0, (char *) 0}
+};
+
static const assoc private_modes[] =
/* DEC \E[ ... [hl] modes recognized by many emulators */
{
@@ -532,13 +544,65 @@ static const assoc ecma_highlights[] =
{(char *) 0, (char *) 0}
};
+static int
+skip_csi(const char *cap)
+{
+ int result = 0;
+ if (cap[0] == '\033' && cap[1] == '[')
+ result = 2;
+ else if (UChar(cap[0]) == 0233)
+ result = 1;
+ return result;
+}
+
+static bool
+same_param(const char *table, const char *param, unsigned length)
+{
+ bool result = FALSE;
+ if (strncmp(table, param, length) == 0) {
+ result = !isdigit(UChar(param[length]));
+ }
+ return result;
+}
+
+static char *
+lookup_params(const assoc * table, char *dst, char *src)
+{
+ const char *ep = strtok(src, ";");
+ const assoc *ap;
+
+ do {
+ bool found = FALSE;
+
+ for (ap = table; ap->from; ap++) {
+ size_t tlen = strlen(ap->from);
+
+ if (same_param(ap->from, ep, tlen)) {
+ (void) strcat(dst, ap->to);
+ found = TRUE;
+ break;
+ }
+ }
+
+ if (!found)
+ (void) strcat(dst, ep);
+ (void) strcat(dst, ";");
+ } while
+ ((ep = strtok((char *) 0, ";")));
+
+ dst[strlen(dst) - 1] = '\0';
+
+ return dst;
+}
+
static void
-analyze_string(const char *name, const char *cap, TERMTYPE * tp)
+analyze_string(const char *name, const char *cap, TERMTYPE *tp)
{
char buf[MAX_TERMINFO_LENGTH];
char buf2[MAX_TERMINFO_LENGTH];
- const char *sp, *ep;
+ const char *sp;
const assoc *ap;
+ int tp_lines = tp->Numbers[2];
if (cap == ABSENT_STRING || cap == CANCELLED_STRING)
return;
@@ -547,8 +611,11 @@ analyze_string(const char *name, const char *cap, TERMTYPE * tp)
buf[0] = '\0';
for (sp = cap; *sp; sp++) {
int i;
+ int csi;
size_t len = 0;
+ size_t next;
const char *expansion = 0;
+ char buf3[MAX_TERMINFO_LENGTH];
/* first, check other capabilities in this entry */
for (i = 0; i < STRCOUNT; i++) {
@@ -586,100 +653,109 @@ analyze_string(const char *name, const char *cap, TERMTYPE * tp)
}
/* now check the standard capabilities */
- if (!expansion)
+ if (!expansion) {
+ csi = skip_csi(sp);
for (ap = std_caps; ap->from; ap++) {
- len = strlen(ap->from);
+ size_t adj = csi ? 2 : 0;
- if (strncmp(ap->from, sp, len) == 0) {
+ len = strlen(ap->from);
+ if (csi && skip_csi(ap->from) != csi)
+ continue;
+ if (len > adj
+ && strncmp(ap->from + adj, sp + csi, len - adj) == 0) {
expansion = ap->to;
+ len -= adj;
+ len += csi;
break;
}
}
+ }
- /* now check for private-mode sequences */
+ /* now check for standard-mode sequences */
if (!expansion
- && sp[0] == '\033' && sp[1] == '[' && sp[2] == '?'
- && (len = strspn(sp + 3, "0123456789;"))
- && ((sp[3 + len] == 'h') || (sp[3 + len] == 'l'))) {
- char buf3[MAX_TERMINFO_LENGTH];
-
- (void) strcpy(buf2, (sp[3 + len] == 'h') ? "DEC+" : "DEC-");
- (void) strncpy(buf3, sp + 3, len);
- len += 4;
- buf3[len] = '\0';
+ && (csi = skip_csi(sp)) != 0
+ && (len = strspn(sp + csi, "0123456789;"))
+ && (next = csi + len)
+ && ((sp[next] == 'h') || (sp[next] == 'l'))) {
- ep = strtok(buf3, ";");
- do {
- bool found = FALSE;
+ (void) strcpy(buf2, (sp[next] == 'h') ? "ECMA+" : "ECMA-");
+ (void) strncpy(buf3, sp + csi, len);
+ buf3[len] = '\0';
+ len += csi + 1;
- for (ap = private_modes; ap->from; ap++) {
- size_t tlen = strlen(ap->from);
+ expansion = lookup_params(std_modes, buf2, buf3);
+ }
- if (strncmp(ap->from, ep, tlen) == 0) {
- (void) strcat(buf2, ap->to);
- found = TRUE;
- break;
- }
- }
+ /* now check for private-mode sequences */
+ if (!expansion
+ && (csi = skip_csi(sp)) != 0
+ && sp[csi] == '?'
+ && (len = strspn(sp + csi + 1, "0123456789;"))
+ && (next = csi + 1 + len)
+ && ((sp[next] == 'h') || (sp[next] == 'l'))) {
+
+ (void) strcpy(buf2, (sp[next] == 'h') ? "DEC+" : "DEC-");
+ (void) strncpy(buf3, sp + csi + 1, len);
+ buf3[len] = '\0';
+ len += csi + 2;
- if (!found)
- (void) strcat(buf2, ep);
- (void) strcat(buf2, ";");
- } while
- ((ep = strtok((char *) 0, ";")));
- buf2[strlen(buf2) - 1] = '\0';
- expansion = buf2;
+ expansion = lookup_params(private_modes, buf2, buf3);
}
/* now check for ECMA highlight sequences */
if (!expansion
- && sp[0] == '\033' && sp[1] == '['
- && (len = strspn(sp + 2, "0123456789;"))
- && sp[2 + len] == 'm') {
- char buf3[MAX_TERMINFO_LENGTH];
+ && (csi = skip_csi(sp)) != 0
+ && (len = strspn(sp + csi, "0123456789;")) != 0
+ && (next = csi + len)
+ && sp[next] == 'm') {
(void) strcpy(buf2, "SGR:");
- (void) strncpy(buf3, sp + 2, len);
- len += 3;
+ (void) strncpy(buf3, sp + csi, len);
buf3[len] = '\0';
+ len += csi + 1;
- ep = strtok(buf3, ";");
- do {
- bool found = FALSE;
-
- for (ap = ecma_highlights; ap->from; ap++) {
- size_t tlen = strlen(ap->from);
-
- if (strncmp(ap->from, ep, tlen) == 0) {
- (void) strcat(buf2, ap->to);
- found = TRUE;
- break;
- }
- }
-
- if (!found)
- (void) strcat(buf2, ep);
- (void) strcat(buf2, ";");
- } while
- ((ep = strtok((char *) 0, ";")));
+ expansion = lookup_params(ecma_highlights, buf2, buf3);
+ }
- buf2[strlen(buf2) - 1] = '\0';
+ if (!expansion
+ && (csi = skip_csi(sp)) != 0
+ && sp[csi] == 'm') {
+ len = csi + 1;
+ (void) strcpy(buf2, "SGR:");
+ strcat(buf2, ecma_highlights[0].to);
expansion = buf2;
}
+
/* now check for scroll region reset */
- if (!expansion) {
- (void) sprintf(buf2, "\033[1;%dr", tp->Numbers[2]);
- len = strlen(buf2);
- if (strncmp(buf2, sp, len) == 0)
+ if (!expansion
+ && (csi = skip_csi(sp)) != 0) {
+ if (sp[csi] == 'r') {
expansion = "RSR";
+ len = 1;
+ } else {
+ (void) sprintf(buf2, "1;%dr", tp_lines);
+ len = strlen(buf2);
+ if (strncmp(buf2, sp + csi, len) == 0)
+ expansion = "RSR";
+ }
+ len += csi;
}
/* now check for home-down */
- if (!expansion) {
- (void) sprintf(buf2, "\033[%d;1H", tp->Numbers[2]);
+ if (!expansion
+ && (csi = skip_csi(sp)) != 0) {
+ (void) sprintf(buf2, "%d;1H", tp_lines);
len = strlen(buf2);
- if (strncmp(buf2, sp, len) == 0)
+ if (strncmp(buf2, sp + csi, len) == 0) {
expansion = "LL";
+ } else {
+ (void) sprintf(buf2, "%dH", tp_lines);
+ len = strlen(buf2);
+ if (strncmp(buf2, sp + csi, len) == 0) {
+ expansion = "LL";
+ }
+ }
+ len += csi;
}
/* now look at the expansion we got, if any */
@@ -723,13 +799,13 @@ file_comparison(int argc, char *argv[])
/* parse entries out of the source file */
_nc_set_source(argv[n]);
- _nc_read_entry_source(stdin, NULL, TRUE, FALSE, NULLHOOK);
+ _nc_read_entry_source(stdin, NULL, TRUE, literal, NULLHOOK);
if (itrace)
(void) fprintf(stderr, "Resolving file %d...\n", n - 0);
/* maybe do use resolution */
- if (!_nc_resolve_uses(!limited)) {
+ if (!_nc_resolve_uses2(!limited, literal)) {
(void) fprintf(stderr,
"There are unresolved use entries in %s:\n",
argv[n]);
@@ -739,7 +815,7 @@ file_comparison(int argc, char *argv[])
(void) fputc('\n', stderr);
}
}
- exit(EXIT_FAILURE);
+ ExitProgram(EXIT_FAILURE);
}
heads[filecount] = _nc_head;
@@ -898,6 +974,7 @@ usage(void)
," -L use long names"
," -R subset (see manpage)"
," -T eliminate size limits (test)"
+ ," -U eliminate post-processing of entries"
," -V print version"
#if NCURSES_XNAMES
," -a with -F, list commented-out caps"
@@ -917,9 +994,15 @@ usage(void)
," -r with -C, output in termcap form"
," -r with -F, resolve use-references"
," -s [d|i|l|c] sort fields"
+#if NCURSES_XNAMES
+ ," -t suppress commented-out capabilities"
+#endif
," -u produce source with 'use='"
," -v number (verbose)"
," -w number (width)"
+#if NCURSES_XNAMES
+ ," -x treat unknown capabilities as user-defined"
+#endif
};
const size_t first = 3;
const size_t last = SIZEOF(tbl);
@@ -933,7 +1016,7 @@ usage(void)
else
fprintf(stderr, "%s\n", tbl[n]);
}
- exit(EXIT_FAILURE);
+ ExitProgram(EXIT_FAILURE);
}
static char *
@@ -970,9 +1053,9 @@ string_variable(const char *type)
/* dump C initializers for the terminal type */
static void
-dump_initializers(TERMTYPE * term)
+dump_initializers(TERMTYPE *term)
{
- int n;
+ unsigned n;
int size;
const char *str = 0;
@@ -1027,7 +1110,7 @@ dump_initializers(TERMTYPE * term)
str = "CANCELLED_BOOLEAN";
break;
}
- (void) printf("\t/* %3d: %-8s */\t%s,\n",
+ (void) printf("\t/* %3u: %-8s */\t%s,\n",
n, ExtBoolname(term, n, boolnames), str);
}
(void) printf("%s;\n", R_CURL);
@@ -1048,14 +1131,14 @@ dump_initializers(TERMTYPE * term)
str = buf;
break;
}
- (void) printf("\t/* %3d: %-8s */\t%s,\n", n,
+ (void) printf("\t/* %3u: %-8s */\t%s,\n", n,
ExtNumname(term, n, numnames), str);
}
(void) printf("%s;\n", R_CURL);
- size = sizeof(TERMTYPE)
- + (NUM_BOOLEANS(term) * sizeof(term->Booleans[0]))
- + (NUM_NUMBERS(term) * sizeof(term->Numbers[0]));
+ size = (sizeof(TERMTYPE)
+ + (NUM_BOOLEANS(term) * sizeof(term->Booleans[0]))
+ + (NUM_NUMBERS(term) * sizeof(term->Numbers[0])));
(void) printf("static char * %s[] = %s\n", name_initializer("string"), L_CURL);
@@ -1068,7 +1151,7 @@ dump_initializers(TERMTYPE * term)
else {
str = string_variable(ExtStrname(term, n, strnames));
}
- (void) printf("\t/* %3d: %-8s */\t%s,\n", n,
+ (void) printf("\t/* %3u: %-8s */\t%s,\n", n,
ExtStrname(term, n, strnames), str);
}
(void) printf("%s;\n", R_CURL);
@@ -1080,15 +1163,15 @@ dump_initializers(TERMTYPE * term)
(void) printf("static char * %s[] = %s\n",
name_initializer("string_ext"), L_CURL);
for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
- (void) printf("\t/* %3d: bool */\t\"%s\",\n",
+ (void) printf("\t/* %3u: bool */\t\"%s\",\n",
n, ExtBoolname(term, n, boolnames));
}
for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) {
- (void) printf("\t/* %3d: num */\t\"%s\",\n",
+ (void) printf("\t/* %3u: num */\t\"%s\",\n",
n, ExtNumname(term, n, numnames));
}
for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
- (void) printf("\t/* %3d: str */\t\"%s\",\n",
+ (void) printf("\t/* %3u: str */\t\"%s\",\n",
n, ExtStrname(term, n, strnames));
}
(void) printf("%s;\n", R_CURL);
@@ -1098,7 +1181,7 @@ dump_initializers(TERMTYPE * term)
/* dump C initializers for the terminal type */
static void
-dump_termtype(TERMTYPE * term)
+dump_termtype(TERMTYPE *term)
{
(void) printf("\t%s\n\t\t%s,\n", L_CURL, name_initializer("alias"));
(void) printf("\t\t(char *)0,\t/* pointer to string table */\n");
@@ -1142,11 +1225,24 @@ optarg_to_number(void)
if (temp == 0 || temp == optarg || *temp != 0) {
fprintf(stderr, "Expected a number, not \"%s\"\n", optarg);
- exit(EXIT_FAILURE);
+ ExitProgram(EXIT_FAILURE);
}
return (int) value;
}
+static char *
+terminal_env(void)
+{
+ char *terminal;
+
+ if ((terminal = getenv("TERM")) == 0) {
+ (void) fprintf(stderr,
+ "infocmp: environment variable TERM not set\n");
+ exit(EXIT_FAILURE);
+ }
+ return terminal;
+}
+
/***************************************************************************
*
* Main sequence
@@ -1156,7 +1252,7 @@ optarg_to_number(void)
int
main(int argc, char *argv[])
{
- char *terminal, *firstdir, *restdir;
+ char *firstdir, *restdir;
/* Avoid "local data >32k" error with mwcc */
/* Also avoid overflowing smaller stacks on systems like AmigaOS */
path *tfile = (path *) malloc(sizeof(path) * MAXTERMS);
@@ -1165,45 +1261,62 @@ main(int argc, char *argv[])
bool filecompare = FALSE;
int initdump = 0;
bool init_analyze = FALSE;
-
- if ((terminal = getenv("TERM")) == 0) {
- (void) fprintf(stderr,
- "infocmp: environment variable TERM not set\n");
- return EXIT_FAILURE;
- }
+ bool suppress_untranslatable = FALSE;
/* where is the terminfo database location going to default to? */
restdir = firstdir = 0;
- while ((c = getopt(argc, argv, "adeEcCfFGgIinlLpqrR:s:uv:Vw:A:B:1T")) != EOF)
+#if NCURSES_XNAMES
+ use_extended_names(FALSE);
+#endif
+
+ while ((c = getopt(argc,
+ argv,
+ "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != EOF) {
switch (c) {
+ case '1':
+ mwidth = 0;
+ break;
+
+ case 'A':
+ firstdir = optarg;
+ break;
+
#if NCURSES_XNAMES
case 'a':
_nc_disable_period = TRUE;
use_extended_names(TRUE);
break;
#endif
- case 'd':
- compare = C_DIFFERENCE;
+ case 'B':
+ restdir = optarg;
break;
- case 'e':
- initdump |= 1;
+ case 'C':
+ outform = F_TERMCAP;
+ tversion = "BSD";
+ if (sortmode == S_DEFAULT)
+ sortmode = S_TERMCAP;
+ break;
+
+ case 'c':
+ compare = C_COMMON;
+ break;
+
+ case 'd':
+ compare = C_DIFFERENCE;
break;
case 'E':
initdump |= 2;
break;
- case 'c':
- compare = C_COMMON;
+ case 'e':
+ initdump |= 1;
break;
- case 'C':
- outform = F_TERMCAP;
- tversion = "BSD";
- if (sortmode == S_DEFAULT)
- sortmode = S_TERMCAP;
+ case 'F':
+ filecompare = TRUE;
break;
case 'f':
@@ -1218,10 +1331,6 @@ main(int argc, char *argv[])
numbers = -1;
break;
- case 'F':
- filecompare = TRUE;
- break;
-
case 'I':
outform = F_TERMINFO;
if (sortmode == S_DEFAULT)
@@ -1233,16 +1342,16 @@ main(int argc, char *argv[])
init_analyze = TRUE;
break;
- case 'l':
- outform = F_TERMINFO;
- break;
-
case 'L':
outform = F_VARIABLE;
if (sortmode == S_DEFAULT)
sortmode = S_VARIABLE;
break;
+ case 'l':
+ outform = F_TERMINFO;
+ break;
+
case 'n':
compare = C_NAND;
break;
@@ -1258,15 +1367,15 @@ main(int argc, char *argv[])
bool_sep = ", ";
break;
+ case 'R':
+ tversion = optarg;
+ break;
+
case 'r':
tversion = 0;
limited = FALSE;
break;
- case 'R':
- tversion = optarg;
- break;
-
case 's':
if (*optarg == 'd')
sortmode = S_NOSORT;
@@ -1279,45 +1388,52 @@ main(int argc, char *argv[])
else {
(void) fprintf(stderr,
"infocmp: unknown sort mode\n");
- return EXIT_FAILURE;
+ ExitProgram(EXIT_FAILURE);
}
break;
+ case 'T':
+ limited = FALSE;
+ break;
+
+#if NCURSES_XNAMES
+ case 't':
+ _nc_disable_period = FALSE;
+ suppress_untranslatable = TRUE;
+ break;
+#endif
+
+ case 'U':
+ literal = TRUE;
+ break;
+
case 'u':
compare = C_USEALL;
break;
+ case 'V':
+ puts(curses_version());
+ ExitProgram(EXIT_SUCCESS);
+
case 'v':
itrace = optarg_to_number();
set_trace_level(itrace);
break;
- case 'V':
- puts(curses_version());
- ExitProgram(EXIT_SUCCESS);
-
case 'w':
mwidth = optarg_to_number();
break;
- case 'A':
- firstdir = optarg;
- break;
-
- case 'B':
- restdir = optarg;
- break;
-
- case '1':
- mwidth = 0;
+#if NCURSES_XNAMES
+ case 'x':
+ use_extended_names(TRUE);
break;
+#endif
- case 'T':
- limited = FALSE;
- break;
default:
usage();
}
+ }
/* by default, sort by terminfo name */
if (sortmode == S_DEFAULT)
@@ -1328,11 +1444,11 @@ main(int argc, char *argv[])
/* make sure we have at least one terminal name to work with */
if (optind >= argc)
- argv[argc++] = terminal;
+ argv[argc++] = terminal_env();
/* if user is after a comparison, make sure we have two entries */
if (compare != C_DEFAULT && optind >= argc - 1)
- argv[argc++] = terminal;
+ argv[argc++] = terminal_env();
/* exactly two terminal names with no options means do -d */
if (argc - optind == 2 && compare == C_DEFAULT)
@@ -1345,7 +1461,7 @@ main(int argc, char *argv[])
if (termcount >= MAXTERMS) {
(void) fprintf(stderr,
"infocmp: too many terminal type arguments\n");
- return EXIT_FAILURE;
+ ExitProgram(EXIT_FAILURE);
} else {
const char *directory = termcount ? restdir : firstdir;
int status;
@@ -1353,6 +1469,7 @@ main(int argc, char *argv[])
tname[termcount] = argv[optind];
if (directory) {
+#if USE_DATABASE
(void) sprintf(tfile[termcount], "%s/%c/%s",
directory,
*argv[optind], argv[optind]);
@@ -1363,11 +1480,15 @@ main(int argc, char *argv[])
status = _nc_read_file_entry(tfile[termcount],
&entries[termcount].tterm);
+#else
+ (void) fprintf(stderr, "terminfo files not supported\n");
+ ExitProgram(EXIT_FAILURE);
+#endif
} else {
if (itrace)
(void) fprintf(stderr,
- "infocmp: reading entry %s from system directories %s\n",
- argv[optind], tname[termcount]);
+ "infocmp: reading entry %s from database\n",
+ tname[termcount]);
status = _nc_read_entry(tname[termcount],
tfile[termcount],
@@ -1379,7 +1500,7 @@ main(int argc, char *argv[])
(void) fprintf(stderr,
"infocmp: couldn't open terminfo file %s.\n",
tfile[termcount]);
- return EXIT_FAILURE;
+ ExitProgram(EXIT_FAILURE);
}
repair_acsc(&entries[termcount].tterm);
termcount++;
@@ -1397,11 +1518,10 @@ main(int argc, char *argv[])
dump_termtype(&entries[0].tterm);
if (initdump & 2)
dump_initializers(&entries[0].tterm);
- ExitProgram(EXIT_SUCCESS);
}
/* analyze the init strings */
- if (init_analyze) {
+ else if (init_analyze) {
#undef CUR
#define CUR entries[0].tterm.
analyze_string("is1", init_1string, &entries[0].tterm);
@@ -1413,60 +1533,68 @@ main(int argc, char *argv[])
analyze_string("smcup", enter_ca_mode, &entries[0].tterm);
analyze_string("rmcup", exit_ca_mode, &entries[0].tterm);
#undef CUR
- ExitProgram(EXIT_SUCCESS);
- }
+ } else {
- /*
- * Here's where the real work gets done
- */
- switch (compare) {
- case C_DEFAULT:
- if (itrace)
- (void) fprintf(stderr,
- "infocmp: about to dump %s\n",
- tname[0]);
- (void) printf("#\tReconstructed via infocmp from file: %s\n",
- tfile[0]);
- len = dump_entry(&entries[0].tterm, limited, numbers, NULL);
- putchar('\n');
- if (itrace)
- (void) fprintf(stderr, "infocmp: length %d\n", len);
- break;
+ /*
+ * Here's where the real work gets done
+ */
+ switch (compare) {
+ case C_DEFAULT:
+ if (itrace)
+ (void) fprintf(stderr,
+ "infocmp: about to dump %s\n",
+ tname[0]);
+ (void) printf("#\tReconstructed via infocmp from file: %s\n",
+ tfile[0]);
+ dump_entry(&entries[0].tterm,
+ suppress_untranslatable,
+ limited,
+ numbers,
+ NULL);
+ len = show_entry();
+ if (itrace)
+ (void) fprintf(stderr, "infocmp: length %d\n", len);
+ break;
- case C_DIFFERENCE:
- if (itrace)
- (void) fprintf(stderr, "infocmp: dumping differences\n");
- (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
- compare_entry(compare_predicate, &entries->tterm, quiet);
- break;
+ case C_DIFFERENCE:
+ if (itrace)
+ (void) fprintf(stderr, "infocmp: dumping differences\n");
+ (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
+ compare_entry(compare_predicate, &entries->tterm, quiet);
+ break;
- case C_COMMON:
- if (itrace)
- (void) fprintf(stderr,
- "infocmp: dumping common capabilities\n");
- (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
- compare_entry(compare_predicate, &entries->tterm, quiet);
- break;
+ case C_COMMON:
+ if (itrace)
+ (void) fprintf(stderr,
+ "infocmp: dumping common capabilities\n");
+ (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
+ compare_entry(compare_predicate, &entries->tterm, quiet);
+ break;
- case C_NAND:
- if (itrace)
- (void) fprintf(stderr,
- "infocmp: dumping differences\n");
- (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
- compare_entry(compare_predicate, &entries->tterm, quiet);
- break;
+ case C_NAND:
+ if (itrace)
+ (void) fprintf(stderr,
+ "infocmp: dumping differences\n");
+ (void) printf("comparing %s to %s.\n", tname[0], tname[1]);
+ compare_entry(compare_predicate, &entries->tterm, quiet);
+ break;
- case C_USEALL:
- if (itrace)
- (void) fprintf(stderr, "infocmp: dumping use entry\n");
- len = dump_entry(&entries[0].tterm, limited, numbers, use_predicate);
- for (i = 1; i < termcount; i++)
- len += dump_uses(tname[i], !(outform == F_TERMCAP || outform
- == F_TCONVERR));
- putchar('\n');
- if (itrace)
- (void) fprintf(stderr, "infocmp: length %d\n", len);
- break;
+ case C_USEALL:
+ if (itrace)
+ (void) fprintf(stderr, "infocmp: dumping use entry\n");
+ dump_entry(&entries[0].tterm,
+ suppress_untranslatable,
+ limited,
+ numbers,
+ use_predicate);
+ for (i = 1; i < termcount; i++)
+ dump_uses(tname[i], !(outform == F_TERMCAP
+ || outform == F_TCONVERR));
+ len = show_entry();
+ if (itrace)
+ (void) fprintf(stderr, "infocmp: length %d\n", len);
+ break;
+ }
}
} else if (compare == C_USEALL)
(void) fprintf(stderr, "Sorry, -u doesn't work with -F\n");
@@ -1478,6 +1606,7 @@ main(int argc, char *argv[])
else
file_comparison(argc - optind, argv + optind);
+ free(tfile);
ExitProgram(EXIT_SUCCESS);
}