/****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2004,2005 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 *
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
+ * and: Thomas E. Dickey 1996-on *
****************************************************************************/
/*
#include <progs.priv.h>
-#include <term_entry.h>
#include <dump_entry.h>
-MODULE_ID("$Id: infocmp.c,v 1.68 2002/10/06 01:13:04 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.79 2005/09/25 00:39:43 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
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";
#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);
***************************************************************************/
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))
}
static int
-use_predicate(int type, int idx)
+use_predicate(unsigned type, PredIdx idx)
/* predicate function to use for use decompilation */
{
ENTRY *ep;
}
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])
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);
#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;
}
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];
{"\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 */
{
{(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 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 assoc *ap;
+ int tp_lines = tp->Numbers[2];
if (cap == ABSENT_STRING || cap == CANCELLED_STRING)
return;
buf[0] = '\0';
for (sp = cap; *sp; sp++) {
int i;
+ int csi;
size_t len = 0;
const char *expansion = 0;
}
/* 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 (len > adj
+ && strncmp(ap->from + adj, sp + csi, len - adj) == 0) {
expansion = ap->to;
+ len -= adj;
+ len += csi;
break;
}
}
+ }
+
+ /* now check for standard-mode sequences */
+ if (!expansion
+ && (csi = skip_csi(sp)) != 0
+ && (len = strspn(sp + csi, "0123456789;"))
+ && ((sp[csi + len] == 'h') || (sp[csi + len] == 'l'))) {
+ char buf3[MAX_TERMINFO_LENGTH];
+
+ (void) strcpy(buf2, (sp[csi + len] == 'h') ? "ECMA+" : "ECMA-");
+ (void) strncpy(buf3, sp + csi, len);
+ len += csi + 1;
+ buf3[len] = '\0';
+
+ ep = strtok(buf3, ";");
+ do {
+ bool found = FALSE;
+
+ for (ap = std_modes; 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, ";")));
+ buf2[strlen(buf2) - 1] = '\0';
+ expansion = buf2;
+ }
/* now check for private-mode sequences */
if (!expansion
- && sp[0] == '\033' && sp[1] == '[' && sp[2] == '?'
- && (len = strspn(sp + 3, "0123456789;"))
- && ((sp[3 + len] == 'h') || (sp[3 + len] == 'l'))) {
+ && (csi = skip_csi(sp)) != 0
+ && sp[csi] == '?'
+ && (len = strspn(sp + csi + 1, "0123456789;"))
+ && ((sp[csi + 1 + len] == 'h') || (sp[csi + 1 + len] == 'l'))) {
char buf3[MAX_TERMINFO_LENGTH];
- (void) strcpy(buf2, (sp[3 + len] == 'h') ? "DEC+" : "DEC-");
- (void) strncpy(buf3, sp + 3, len);
- len += 4;
+ (void) strcpy(buf2, (sp[csi + 1 + len] == 'h') ? "DEC+" : "DEC-");
+ (void) strncpy(buf3, sp + csi + 1, len);
+ len += csi + 2;
buf3[len] = '\0';
ep = strtok(buf3, ";");
/* now check for ECMA highlight sequences */
if (!expansion
- && sp[0] == '\033' && sp[1] == '['
- && (len = strspn(sp + 2, "0123456789;"))
- && sp[2 + len] == 'm') {
+ && (csi = skip_csi(sp)) != 0
+ && (len = strspn(sp + csi, "0123456789;")) != 0
+ && sp[csi + len] == 'm') {
char buf3[MAX_TERMINFO_LENGTH];
(void) strcpy(buf2, "SGR:");
- (void) strncpy(buf3, sp + 2, len);
- len += 3;
+ (void) strncpy(buf3, sp + csi, len);
+ len += csi + 1;
buf3[len] = '\0';
ep = strtok(buf3, ";");
buf2[strlen(buf2) - 1] = '\0';
expansion = buf2;
}
+
+ 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 */
/* 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]);
(void) fputc('\n', stderr);
}
}
- exit(EXIT_FAILURE);
+ ExitProgram(EXIT_FAILURE);
}
heads[filecount] = _nc_head;
," -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"
," -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);
else
fprintf(stderr, "%s\n", tbl[n]);
}
- exit(EXIT_FAILURE);
+ ExitProgram(EXIT_FAILURE);
}
static char *
/* 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;
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);
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);
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);
(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);
/* 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");
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
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);
bool init_analyze = FALSE;
bool suppress_untranslatable = FALSE;
- if ((terminal = getenv("TERM")) == 0) {
- (void) fprintf(stderr,
- "infocmp: environment variable TERM not set\n");
- return EXIT_FAILURE;
- }
-
/* where is the terminfo database location going to default to? */
restdir = firstdir = 0;
+#if NCURSES_XNAMES
+ use_extended_names(FALSE);
+#endif
+
while ((c = getopt(argc,
argv,
- "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtuVv:w:")) != EOF)
+ "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != EOF)
switch (c) {
case '1':
mwidth = 0;
break;
#endif
+ case 'U':
+ literal = TRUE;
+ break;
+
case 'u':
compare = C_USEALL;
break;
mwidth = optarg_to_number();
break;
+#if NCURSES_XNAMES
+ case 'x':
+ use_extended_names(TRUE);
+ break;
+#endif
+
default:
usage();
}
/* 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)
projects / ncurses.git / blobdiff