/****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 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 *
/*
* infocmp.c -- decompile an entry, or compare two entries
* written by Eric S. Raymond
+ * and Thomas E Dickey
*/
#include <progs.priv.h>
#include <dump_entry.h>
-MODULE_ID("$Id: infocmp.c,v 1.86 2007/01/21 01:09:07 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.103 2008/08/16 22:04:56 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
-#define MAXTERMS 32 /* max # terminal arguments we can handle */
#define MAX_STRING 1024 /* maximum formatted string */
const char *_nc_progname = "infocmp";
*
***************************************************************************/
-static char *tname[MAXTERMS]; /* terminal type names */
-static ENTRY entries[MAXTERMS]; /* terminfo entries */
+static ENTRY *entries; /* terminfo entries */
static int termcount; /* count of terminal entries */
static bool limited = TRUE; /* "-r" option is not set */
while (termcount-- > 0)
_nc_free_termtype(&entries[termcount].tterm);
_nc_leaks_dump_entry();
- _nc_leaks_tic();
- _nc_free_and_exit(code);
+ free(entries);
+ _nc_free_tic(code);
}
#endif
useeq(ENTRY * e1, ENTRY * e2)
/* are the use references in two entries equivalent? */
{
- int i, j;
+ unsigned i, j;
if (e1->nuses != e2->nuses)
return (FALSE);
print_uses(ENTRY * ep, FILE *fp)
/* print an entry's use references */
{
- int i;
+ unsigned i;
if (!ep->nuses)
fputs("NULL", fp);
static char *
lookup_params(const assoc * table, char *dst, char *src)
{
+ char *result = 0;
const char *ep = strtok(src, ";");
- const assoc *ap;
- do {
- bool found = FALSE;
+ if (ep != 0) {
+ const assoc *ap;
- for (ap = table; ap->from; ap++) {
- size_t tlen = strlen(ap->from);
+ do {
+ bool found = FALSE;
- if (same_param(ap->from, ep, tlen)) {
- (void) strcat(dst, ap->to);
- found = TRUE;
- break;
+ 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, ";")));
+ if (!found)
+ (void) strcat(dst, ep);
+ (void) strcat(dst, ";");
+ } while
+ ((ep = strtok((char *) 0, ";")));
- dst[strlen(dst) - 1] = '\0';
+ dst[strlen(dst) - 1] = '\0';
- return dst;
+ result = dst;
+ }
+ return result;
}
static void
analyze_string(const char *name, const char *cap, TERMTYPE *tp)
{
- char buf[MAX_TERMINFO_LENGTH];
char buf2[MAX_TERMINFO_LENGTH];
const char *sp;
const assoc *ap;
return;
(void) printf("%s: ", name);
- buf[0] = '\0';
for (sp = cap; *sp; sp++) {
int i;
int csi;
if (!expansion) {
csi = skip_csi(sp);
for (ap = std_caps; ap->from; ap++) {
- size_t adj = csi ? 2 : 0;
+ size_t adj = (size_t) (csi ? 2 : 0);
len = strlen(ap->from);
if (csi && skip_csi(ap->from) != csi)
&& strncmp(ap->from + adj, sp + csi, len - adj) == 0) {
expansion = ap->to;
len -= adj;
- len += csi;
+ len += (size_t) csi;
break;
}
}
if (!expansion
&& (csi = skip_csi(sp)) != 0
&& (len = strspn(sp + csi, "0123456789;"))
- && (next = csi + len)
+ && (len < sizeof(buf3))
+ && (next = (size_t) csi + len)
&& ((sp[next] == 'h') || (sp[next] == 'l'))) {
(void) strcpy(buf2, (sp[next] == 'h') ? "ECMA+" : "ECMA-");
(void) strncpy(buf3, sp + csi, len);
buf3[len] = '\0';
- len += csi + 1;
+ len += (size_t) csi + 1;
expansion = lookup_params(std_modes, buf2, buf3);
}
&& (csi = skip_csi(sp)) != 0
&& sp[csi] == '?'
&& (len = strspn(sp + csi + 1, "0123456789;"))
- && (next = csi + 1 + len)
+ && (len < sizeof(buf3))
+ && (next = (size_t) 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;
+ len += (size_t) csi + 2;
expansion = lookup_params(private_modes, buf2, buf3);
}
if (!expansion
&& (csi = skip_csi(sp)) != 0
&& (len = strspn(sp + csi, "0123456789;")) != 0
- && (next = csi + len)
+ && (len < sizeof(buf3))
+ && (next = (size_t) csi + len)
&& sp[next] == 'm') {
(void) strcpy(buf2, "SGR:");
(void) strncpy(buf3, sp + csi, len);
buf3[len] = '\0';
- len += csi + 1;
+ len += (size_t) csi + 1;
expansion = lookup_params(ecma_highlights, buf2, buf3);
}
if (!expansion
&& (csi = skip_csi(sp)) != 0
&& sp[csi] == 'm') {
- len = csi + 1;
+ len = (size_t) csi + 1;
(void) strcpy(buf2, "SGR:");
strcat(buf2, ecma_highlights[0].to);
expansion = buf2;
if (strncmp(buf2, sp + csi, len) == 0)
expansion = "RSR";
}
- len += csi;
+ len += (size_t) csi;
}
/* now check for home-down */
expansion = "LL";
}
}
- len += csi;
+ len += (size_t) csi;
}
/* now look at the expansion we got, if any */
if (expansion) {
- (void) sprintf(buf + strlen(buf), "{%s}", expansion);
+ printf("{%s}", expansion);
sp += len - 1;
- continue;
} else {
/* couldn't match anything */
buf2[0] = *sp;
buf2[1] = '\0';
- (void) strcat(buf, TIC_EXPAND(buf2));
+ fputs(TIC_EXPAND(buf2), stdout);
}
}
- (void) printf("%s\n", buf);
+ putchar('\n');
}
/***************************************************************************
ENTRY *qp, *rp;
int i, n;
+ memset(heads, 0, sizeof(heads));
dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, itrace, FALSE);
for (n = 0; n < argc && n < MAXCOMPARE; n++) {
case C_DIFFERENCE:
if (itrace)
(void) fprintf(stderr,
- "infocmp: dumping differences\n");
+ "%s: dumping differences\n",
+ _nc_progname);
(void) printf("comparing %s to %s.\n", name1, name2);
compare_entry(compare_predicate, &entries->tterm, quiet);
break;
case C_COMMON:
if (itrace)
(void) fprintf(stderr,
- "infocmp: dumping common capabilities\n");
+ "%s: dumping common capabilities\n",
+ _nc_progname);
(void) printf("comparing %s to %s.\n", name1, name2);
compare_entry(compare_predicate, &entries->tterm, quiet);
break;
case C_NAND:
if (itrace)
(void) fprintf(stderr,
- "infocmp: dumping differences\n");
+ "%s: dumping differences\n",
+ _nc_progname);
(void) printf("comparing %s to %s.\n", name1, name2);
compare_entry(compare_predicate, &entries->tterm, quiet);
break;
dump_initializers(TERMTYPE *term)
{
unsigned n;
- int size;
const char *str = 0;
printf("\nstatic char %s[] = \"%s\";\n\n",
}
*tp++ = '"';
*tp = '\0';
- size += (strlen(term->Strings[n]) + 1);
(void) printf("static char %-20s[] = %s;\n",
string_variable(ExtStrname(term, n, strnames)), buf);
}
}
(void) printf("%s;\n", R_CURL);
- 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);
for_each_string(n, term) {
NUM_STRINGS(term) - STRCOUNT);
(void) printf("#endif /* NCURSES_XNAMES */\n");
+#else
+ (void) term;
#endif /* NCURSES_XNAMES */
(void) printf("\t%s\n", R_CURL);
}
if ((terminal = getenv("TERM")) == 0) {
(void) fprintf(stderr,
- "infocmp: environment variable TERM not set\n");
+ "%s: environment variable TERM not set\n",
+ _nc_progname);
exit(EXIT_FAILURE);
}
return terminal;
int
main(int argc, char *argv[])
{
- 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);
+ path *tfile = 0;
+ char **tname = 0;
+ int maxterms;
+
+ char **myargv;
+
+ char *firstdir, *restdir;
int c, i, len;
bool formatted = FALSE;
bool filecompare = FALSE;
use_extended_names(FALSE);
#endif
+ _nc_progname = _nc_rootname(argv[0]);
+
+ /* make sure we have enough space to add two terminal entries */
+ myargv = typeCalloc(char *, (size_t) (argc + 3));
+ memcpy(myargv, argv, (sizeof(char *) * (size_t) argc));
+ argv = myargv;
+
while ((c = getopt(argc,
argv,
- "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != EOF) {
+ "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != -1) {
switch (c) {
case '1':
mwidth = 0;
case 'r':
tversion = 0;
- limited = FALSE;
break;
case 's':
sortmode = S_TERMCAP;
else {
(void) fprintf(stderr,
- "infocmp: unknown sort mode\n");
+ "%s: unknown sort mode\n",
+ _nc_progname);
ExitProgram(EXIT_FAILURE);
}
break;
}
}
+ maxterms = (argc + 2 - optind);
+ tfile = typeMalloc(path, maxterms);
+ tname = typeCalloc(char *, maxterms);
+ entries = typeCalloc(ENTRY, maxterms);
+
+ if (tfile == 0
+ || tname == 0
+ || entries == 0) {
+ fprintf(stderr, "%s: not enough memory\n", _nc_progname);
+ ExitProgram(EXIT_FAILURE);
+ }
+
/* by default, sort by terminfo name */
if (sortmode == S_DEFAULT)
sortmode = S_TERMINFO;
/* grab the entries */
termcount = 0;
for (; optind < argc; optind++) {
- if (termcount >= MAXTERMS) {
- (void) fprintf(stderr,
- "infocmp: too many terminal type arguments\n");
- ExitProgram(EXIT_FAILURE);
- } else {
- const char *directory = termcount ? restdir : firstdir;
- int status;
+ const char *directory = termcount ? restdir : firstdir;
+ int status;
- tname[termcount] = argv[optind];
+ tname[termcount] = argv[optind];
- if (directory) {
+ if (directory) {
#if USE_DATABASE
- (void) sprintf(tfile[termcount], "%s/%c/%s",
- directory,
- *argv[optind], argv[optind]);
- if (itrace)
- (void) fprintf(stderr,
- "infocmp: reading entry %s from file %s\n",
- argv[optind], tfile[termcount]);
-
- status = _nc_read_file_entry(tfile[termcount],
- &entries[termcount].tterm);
+#if MIXEDCASE_FILENAMES
+#define LEAF_FMT "%c"
#else
- (void) fprintf(stderr, "terminfo files not supported\n");
- ExitProgram(EXIT_FAILURE);
+#define LEAF_FMT "%02x"
#endif
- } else {
- if (itrace)
- (void) fprintf(stderr,
- "infocmp: reading entry %s from database\n",
- tname[termcount]);
-
- status = _nc_read_entry(tname[termcount],
- tfile[termcount],
- &entries[termcount].tterm);
- directory = TERMINFO; /* for error message */
- }
+ (void) sprintf(tfile[termcount], "%s/" LEAF_FMT "/%s",
+ directory,
+ UChar(*argv[optind]), argv[optind]);
+ if (itrace)
+ (void) fprintf(stderr,
+ "%s: reading entry %s from file %s\n",
+ _nc_progname,
+ argv[optind], tfile[termcount]);
- if (status <= 0) {
+ status = _nc_read_file_entry(tfile[termcount],
+ &entries[termcount].tterm);
+#else
+ (void) fprintf(stderr, "%s: terminfo files not supported\n",
+ _nc_progname);
+ ExitProgram(EXIT_FAILURE);
+#endif
+ } else {
+ if (itrace)
(void) fprintf(stderr,
- "infocmp: couldn't open terminfo file %s.\n",
- tfile[termcount]);
- ExitProgram(EXIT_FAILURE);
- }
- repair_acsc(&entries[termcount].tterm);
- termcount++;
+ "%s: reading entry %s from database\n",
+ _nc_progname,
+ tname[termcount]);
+
+ status = _nc_read_entry(tname[termcount],
+ tfile[termcount],
+ &entries[termcount].tterm);
+ directory = TERMINFO; /* for error message */
}
+
+ if (status <= 0) {
+ (void) fprintf(stderr,
+ "%s: couldn't open terminfo file %s.\n",
+ _nc_progname,
+ tfile[termcount]);
+ ExitProgram(EXIT_FAILURE);
+ }
+ repair_acsc(&entries[termcount].tterm);
+ termcount++;
}
#if NCURSES_XNAMES
case C_DEFAULT:
if (itrace)
(void) fprintf(stderr,
- "infocmp: about to dump %s\n",
+ "%s: about to dump %s\n",
+ _nc_progname,
tname[0]);
(void) printf("#\tReconstructed via infocmp from file: %s\n",
tfile[0]);
NULL);
len = show_entry();
if (itrace)
- (void) fprintf(stderr, "infocmp: length %d\n", len);
+ (void) fprintf(stderr, "%s: length %d\n", _nc_progname, len);
break;
case C_DIFFERENCE:
if (itrace)
- (void) fprintf(stderr, "infocmp: dumping differences\n");
+ (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname);
(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");
+ "%s: dumping common capabilities\n",
+ _nc_progname);
(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");
+ "%s: dumping differences\n",
+ _nc_progname);
(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");
+ (void) fprintf(stderr, "%s: dumping use entry\n", _nc_progname);
dump_entry(&entries[0].tterm,
suppress_untranslatable,
limited,
|| outform == F_TCONVERR));
len = show_entry();
if (itrace)
- (void) fprintf(stderr, "infocmp: length %d\n", len);
+ (void) fprintf(stderr, "%s: length %d\n", _nc_progname, len);
break;
}
}
else
file_comparison(argc - optind, argv + optind);
+#if NO_LEAKS
+ free(myargv);
free(tfile);
+ free(tname);
+#endif
ExitProgram(EXIT_SUCCESS);
}
projects / ncurses.git / blobdiff