ncurses 5.9 - patch 20120407
[ncurses.git] / progs / infocmp.c
index 6657c931f7263adfe2e57af42d7fe3403306b8bc..2e6f67a8b6981e6648d2e36caf15f8925508d168 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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.89 2007/07/21 17:45:59 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.115 2012/04/07 19:12:01 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";
@@ -60,8 +60,7 @@ typedef char path[PATH_MAX];
  *
  ***************************************************************************/
 
-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 */
@@ -71,8 +70,9 @@ static const char *bool_sep = ":";
 static const char *s_absent = "NULL";
 static const char *s_cancel = "NULL";
 static const char *tversion;   /* terminfo version selected */
-static int itrace;             /* trace flag for debugging */
+static unsigned itrace;                /* trace flag for debugging */
 static int mwidth = 60;
+static int mheight = 65535;
 static int numbers = 0;                /* format "%'char'" to/from "%{number}" */
 static int outform = F_TERMINFO;       /* output format */
 static int sortmode;           /* sort_mode */
@@ -96,6 +96,7 @@ ExitProgram(int code)
     while (termcount-- > 0)
        _nc_free_termtype(&entries[termcount].tterm);
     _nc_leaks_dump_entry();
+    free(entries);
     _nc_free_tic(code);
 }
 #endif
@@ -106,7 +107,7 @@ canonical_name(char *ptr, char *buf)
 {
     char *bp;
 
-    (void) strcpy(buf, ptr);
+    _nc_STRCPY(buf, ptr, NAMESIZE);
     if ((bp = strchr(buf, '|')) != 0)
        *bp = '\0';
 
@@ -221,7 +222,7 @@ static bool
 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);
@@ -271,7 +272,7 @@ static void
 print_uses(ENTRY * ep, FILE *fp)
 /* print an entry's use references */
 {
-    int i;
+    unsigned i;
 
     if (!ep->nuses)
        fputs("NULL", fp);
@@ -307,13 +308,13 @@ dump_numeric(int val, char *buf)
 {
     switch (val) {
     case ABSENT_NUMERIC:
-       strcpy(buf, s_absent);
+       _nc_STRCPY(buf, s_absent, MAX_STRING);
        break;
     case CANCELLED_NUMERIC:
-       strcpy(buf, s_cancel);
+       _nc_STRCPY(buf, s_cancel, MAX_STRING);
        break;
     default:
-       sprintf(buf, "%d", val);
+       _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING) "%d", val);
        break;
     }
 }
@@ -323,14 +324,30 @@ dump_string(char *val, char *buf)
 /* display the value of a string capability */
 {
     if (val == ABSENT_STRING)
-       strcpy(buf, s_absent);
+       _nc_STRCPY(buf, s_absent, MAX_STRING);
     else if (val == CANCELLED_STRING)
-       strcpy(buf, s_cancel);
+       _nc_STRCPY(buf, s_cancel, MAX_STRING);
     else {
-       sprintf(buf, "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val));
+       _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING)
+                   "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val));
     }
 }
 
+/*
+ * ncurses stores two types of non-standard capabilities:
+ * a) capabilities listed past the "STOP-HERE" comment in the Caps file. 
+ *    These are used in the terminfo source file to provide data for termcaps,
+ *    e.g., when there is no equivalent capability in terminfo, as well as for
+ *    widely-used non-standard capabilities.
+ * b) user-definable capabilities, via "tic -x".
+ *
+ * However, if "-x" is omitted from the tic command, both types of
+ * non-standard capability are not loaded into the terminfo database.  This
+ * macro is used for limit-checks against the symbols that tic uses to omit
+ * the two types of non-standard entry.
+ */
+#define check_user_definable(n,limit) if (!_nc_user_definable && (n) > (limit)) break
+
 static void
 compare_predicate(PredType type, PredIdx idx, const char *name)
 /* predicate function to use for entry difference reports */
@@ -344,6 +361,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name)
 
     switch (type) {
     case CMP_BOOLEAN:
+       check_user_definable(idx, BOOLWRITE);
        b1 = e1->tterm.Booleans[idx];
        b2 = e2->tterm.Booleans[idx];
        switch (compare) {
@@ -369,6 +387,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name)
        break;
 
     case CMP_NUMBER:
+       check_user_definable(idx, NUMWRITE);
        n1 = e1->tterm.Numbers[idx];
        n2 = e2->tterm.Numbers[idx];
        dump_numeric(n1, buf1);
@@ -392,6 +411,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name)
        break;
 
     case CMP_STRING:
+       check_user_definable(idx, STRWRITE);
        s1 = e1->tterm.Strings[idx];
        s2 = e2->tterm.Strings[idx];
        switch (compare) {
@@ -556,7 +576,7 @@ skip_csi(const char *cap)
 }
 
 static bool
-same_param(const char *table, const char *param, unsigned length)
+same_param(const char *table, const char *param, size_t length)
 {
     bool result = FALSE;
     if (strncmp(table, param, length) == 0) {
@@ -568,37 +588,41 @@ same_param(const char *table, const char *param, unsigned length)
 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)) {
+                   _nc_STRCAT(dst, ap->to, MAX_TERMINFO_LENGTH);
+                   found = TRUE;
+                   break;
+               }
            }
-       }
 
-       if (!found)
-           (void) strcat(dst, ep);
-       (void) strcat(dst, ";");
-    } while
-       ((ep = strtok((char *) 0, ";")));
+           if (!found)
+               _nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH);
+           _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH);
+       } 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;
@@ -608,7 +632,6 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        return;
     (void) printf("%s: ", name);
 
-    buf[0] = '\0';
     for (sp = cap; *sp; sp++) {
        int i;
        int csi;
@@ -656,7 +679,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        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)
@@ -665,7 +688,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
                    && strncmp(ap->from + adj, sp + csi, len - adj) == 0) {
                    expansion = ap->to;
                    len -= adj;
-                   len += csi;
+                   len += (size_t) csi;
                    break;
                }
            }
@@ -675,13 +698,18 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        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-");
+           _nc_STRCPY(buf2,
+                      ((sp[next] == 'h')
+                       ? "ECMA+"
+                       : "ECMA-"),
+                      sizeof(buf2));
            (void) strncpy(buf3, sp + csi, len);
            buf3[len] = '\0';
-           len += csi + 1;
+           len += (size_t) csi + 1;
 
            expansion = lookup_params(std_modes, buf2, buf3);
        }
@@ -691,13 +719,18 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
            && (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-");
+           _nc_STRCPY(buf2,
+                      ((sp[next] == 'h')
+                       ? "DEC+"
+                       : "DEC-"),
+                      sizeof(buf2));
            (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);
        }
@@ -706,13 +739,14 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        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:");
+           _nc_STRCPY(buf2, "SGR:", sizeof(buf2));
            (void) strncpy(buf3, sp + csi, len);
            buf3[len] = '\0';
-           len += csi + 1;
+           len += (size_t) csi + 1;
 
            expansion = lookup_params(ecma_highlights, buf2, buf3);
        }
@@ -720,9 +754,9 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        if (!expansion
            && (csi = skip_csi(sp)) != 0
            && sp[csi] == 'm') {
-           len = csi + 1;
-           (void) strcpy(buf2, "SGR:");
-           strcat(buf2, ecma_highlights[0].to);
+           len = (size_t) csi + 1;
+           _nc_STRCPY(buf2, "SGR:", sizeof(buf2));
+           _nc_STRCAT(buf2, ecma_highlights[0].to, sizeof(buf2));
            expansion = buf2;
        }
 
@@ -733,44 +767,43 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
                expansion = "RSR";
                len = 1;
            } else {
-               (void) sprintf(buf2, "1;%dr", tp_lines);
+               _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "1;%dr", tp_lines);
                len = strlen(buf2);
                if (strncmp(buf2, sp + csi, len) == 0)
                    expansion = "RSR";
            }
-           len += csi;
+           len += (size_t) csi;
        }
 
        /* now check for home-down */
        if (!expansion
            && (csi = skip_csi(sp)) != 0) {
-           (void) sprintf(buf2, "%d;1H", tp_lines);
+           _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%d;1H", tp_lines);
            len = strlen(buf2);
            if (strncmp(buf2, sp + csi, len) == 0) {
                expansion = "LL";
            } else {
-               (void) sprintf(buf2, "%dH", tp_lines);
+               _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%dH", tp_lines);
                len = strlen(buf2);
                if (strncmp(buf2, sp + csi, len) == 0) {
                    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');
 }
 
 /***************************************************************************
@@ -789,7 +822,8 @@ file_comparison(int argc, char *argv[])
     ENTRY *qp, *rp;
     int i, n;
 
-    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, itrace, FALSE);
+    memset(heads, 0, sizeof(heads));
+    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE);
 
     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
        if (freopen(argv[n], "r", stdin) == 0)
@@ -888,8 +922,6 @@ file_comparison(int argc, char *argv[])
 
     (void) printf("The following entries are equivalent:\n");
     for (qp = heads[0]; qp; qp = qp->next) {
-       rp = qp->crosslinks[0];
-
        if (qp->ncrosslinks == 1) {
            rp = qp->crosslinks[0];
 
@@ -932,7 +964,8 @@ file_comparison(int argc, char *argv[])
                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;
@@ -940,7 +973,8 @@ file_comparison(int argc, char *argv[])
                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;
@@ -948,7 +982,8 @@ file_comparison(int argc, char *argv[])
                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;
@@ -967,7 +1002,9 @@ usage(void)
        "Usage: infocmp [options] [-A directory] [-B directory] [termname...]"
        ,""
        ,"Options:"
+       ,"  -0    print single-row"
        ,"  -1    print single-column"
+       ,"  -K    use termcap-names and BSD syntax"
        ,"  -C    use termcap-names"
        ,"  -F    compare terminfo-files"
        ,"  -I    use terminfo-names"
@@ -1023,19 +1060,23 @@ static char *
 any_initializer(const char *fmt, const char *type)
 {
     static char *initializer;
+    static size_t need;
     char *s;
 
-    if (initializer == 0)
-       initializer = (char *) malloc(strlen(entries->tterm.term_names) +
-                                     strlen(type) + strlen(fmt));
+    if (initializer == 0) {
+       need = (strlen(entries->tterm.term_names)
+               + strlen(type)
+               + strlen(fmt));
+       initializer = (char *) malloc(need);
+    }
 
-    (void) strcpy(initializer, entries->tterm.term_names);
+    _nc_STRCPY(initializer, entries->tterm.term_names, need);
     for (s = initializer; *s != 0 && *s != '|'; s++) {
        if (!isalnum(UChar(*s)))
            *s = '_';
     }
     *s = 0;
-    (void) sprintf(s, fmt, type);
+    _nc_SPRINTF(s, _nc_SLIMIT(need) fmt, type);
     return initializer;
 }
 
@@ -1056,7 +1097,6 @@ static void
 dump_initializers(TERMTYPE *term)
 {
     unsigned n;
-    int size;
     const char *str = 0;
 
     printf("\nstatic char %s[] = \"%s\";\n\n",
@@ -1067,9 +1107,10 @@ dump_initializers(TERMTYPE *term)
 
        if (VALID_STRING(term->Strings[n])) {
            tp = buf;
+#define TP_LIMIT       ((MAX_STRING - 5) - (size_t)(tp - buf))
            *tp++ = '"';
            for (sp = term->Strings[n];
-                *sp != 0 && (tp - buf) < MAX_STRING - 6;
+                *sp != 0 && TP_LIMIT > 2;
                 sp++) {
                if (isascii(UChar(*sp))
                    && isprint(UChar(*sp))
@@ -1077,14 +1118,15 @@ dump_initializers(TERMTYPE *term)
                    && *sp != '"')
                    *tp++ = *sp;
                else {
-                   (void) sprintf(tp, "\\%03o", UChar(*sp));
+                   _nc_SPRINTF(tp, _nc_SLIMIT(TP_LIMIT) "\\%03o", UChar(*sp));
                    tp += 4;
                }
            }
            *tp++ = '"';
            *tp = '\0';
            (void) printf("static char %-20s[] = %s;\n",
-                         string_variable(ExtStrname(term, n, strnames)), buf);
+                         string_variable(ExtStrname(term, (int) n, strnames)),
+                         buf);
        }
     }
     printf("\n");
@@ -1110,7 +1152,7 @@ dump_initializers(TERMTYPE *term)
            break;
        }
        (void) printf("\t/* %3u: %-8s */\t%s,\n",
-                     n, ExtBoolname(term, n, boolnames), str);
+                     n, ExtBoolname(term, (int) n, boolnames), str);
     }
     (void) printf("%s;\n", R_CURL);
 
@@ -1126,19 +1168,15 @@ dump_initializers(TERMTYPE *term)
            str = "CANCELLED_NUMERIC";
            break;
        default:
-           sprintf(buf, "%d", term->Numbers[n]);
+           _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "%d", term->Numbers[n]);
            str = buf;
            break;
        }
        (void) printf("\t/* %3u: %-8s */\t%s,\n", n,
-                     ExtNumname(term, n, numnames), str);
+                     ExtNumname(term, (int) 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])));
-
     (void) printf("static char * %s[] = %s\n", name_initializer("string"), L_CURL);
 
     for_each_string(n, term) {
@@ -1148,10 +1186,10 @@ dump_initializers(TERMTYPE *term)
        else if (term->Strings[n] == CANCELLED_STRING)
            str = "CANCELLED_STRING";
        else {
-           str = string_variable(ExtStrname(term, n, strnames));
+           str = string_variable(ExtStrname(term, (int) n, strnames));
        }
        (void) printf("\t/* %3u: %-8s */\t%s,\n", n,
-                     ExtStrname(term, n, strnames), str);
+                     ExtStrname(term, (int) n, strnames), str);
     }
     (void) printf("%s;\n", R_CURL);
 
@@ -1163,15 +1201,15 @@ dump_initializers(TERMTYPE *term)
                      name_initializer("string_ext"), L_CURL);
        for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
            (void) printf("\t/* %3u: bool */\t\"%s\",\n",
-                         n, ExtBoolname(term, n, boolnames));
+                         n, ExtBoolname(term, (int) n, boolnames));
        }
        for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) {
            (void) printf("\t/* %3u: num */\t\"%s\",\n",
-                         n, ExtNumname(term, n, numnames));
+                         n, ExtNumname(term, (int) n, numnames));
        }
        for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
            (void) printf("\t/* %3u: str */\t\"%s\",\n",
-                         n, ExtStrname(term, n, strnames));
+                         n, ExtStrname(term, (int) n, strnames));
        }
        (void) printf("%s;\n", R_CURL);
     }
@@ -1212,6 +1250,8 @@ dump_termtype(TERMTYPE *term)
                  NUM_STRINGS(term) - STRCOUNT);
 
     (void) printf("#endif /* NCURSES_XNAMES */\n");
+#else
+    (void) term;
 #endif /* NCURSES_XNAMES */
     (void) printf("\t%s\n", R_CURL);
 }
@@ -1236,25 +1276,57 @@ terminal_env(void)
 
     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;
 }
 
+/*
+ * Show the databases that infocmp knows about.  The location to which it writes is
+ */
+static void
+show_databases(void)
+{
+    DBDIRS state;
+    int offset;
+    const char *path2;
+
+    _nc_first_db(&state, &offset);
+    while ((path2 = _nc_next_db(&state, &offset)) != 0) {
+       printf("%s\n", path2);
+    }
+    _nc_last_db();
+}
+
 /***************************************************************************
  *
  * Main sequence
  *
  ***************************************************************************/
 
+#if NO_LEAKS
+#define MAIN_LEAKS() \
+    free(myargv); \
+    free(tfile); \
+    free(tname)
+#else
+#define MAIN_LEAKS()           /* nothing */
+#endif
+
 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;
+    size_t maxterms;
+
+    char **myargv;
+
+    char *firstdir, *restdir;
     int c, i, len;
     bool formatted = FALSE;
     bool filecompare = FALSE;
@@ -1268,11 +1340,24 @@ main(int argc, char *argv[])
 #if NCURSES_XNAMES
     use_extended_names(FALSE);
 #endif
+    _nc_strict_bsd = 0;
+
+    _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")) != -1) {
+                      "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) {
        switch (c) {
+       case '0':
+           mwidth = 65535;
+           mheight = 1;
+           break;
+
        case '1':
            mwidth = 0;
            break;
@@ -1291,6 +1376,9 @@ main(int argc, char *argv[])
            restdir = optarg;
            break;
 
+       case 'K':
+           _nc_strict_bsd = 1;
+           /* FALLTHRU */
        case 'C':
            outform = F_TERMCAP;
            tversion = "BSD";
@@ -1298,6 +1386,11 @@ main(int argc, char *argv[])
                sortmode = S_TERMCAP;
            break;
 
+       case 'D':
+           show_databases();
+           ExitProgram(EXIT_SUCCESS);
+           break;
+
        case 'c':
            compare = C_COMMON;
            break;
@@ -1372,7 +1465,6 @@ main(int argc, char *argv[])
 
        case 'r':
            tversion = 0;
-           limited = FALSE;
            break;
 
        case 's':
@@ -1386,7 +1478,8 @@ main(int argc, char *argv[])
                sortmode = S_TERMCAP;
            else {
                (void) fprintf(stderr,
-                              "infocmp: unknown sort mode\n");
+                              "%s: unknown sort mode\n",
+                              _nc_progname);
                ExitProgram(EXIT_FAILURE);
            }
            break;
@@ -1415,7 +1508,7 @@ main(int argc, char *argv[])
            ExitProgram(EXIT_SUCCESS);
 
        case 'v':
-           itrace = optarg_to_number();
+           itrace = (unsigned) optarg_to_number();
            set_trace_level(itrace);
            break;
 
@@ -1434,12 +1527,24 @@ main(int argc, char *argv[])
        }
     }
 
+    maxterms = (size_t) (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;
 
     /* set up for display */
-    dump_init(tversion, outform, sortmode, mwidth, itrace, formatted);
+    dump_init(tversion, outform, sortmode, mwidth, mheight, itrace, formatted);
 
     /* make sure we have at least one terminal name to work with */
     if (optind >= argc)
@@ -1457,53 +1562,59 @@ main(int argc, char *argv[])
        /* 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]);
+#if MIXEDCASE_FILENAMES
+#define LEAF_FMT "%c"
+#else
+#define LEAF_FMT "%02x"
+#endif
+               _nc_SPRINTF(tfile[termcount],
+                           _nc_SLIMIT(sizeof(path))
+                           "%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]);
 
-                   status = _nc_read_file_entry(tfile[termcount],
-                                                &entries[termcount].tterm);
+               status = _nc_read_file_entry(tfile[termcount],
+                                            &entries[termcount].tterm);
 #else
-                   (void) fprintf(stderr, "terminfo files not supported\n");
-                   ExitProgram(EXIT_FAILURE);
+               (void) fprintf(stderr, "%s: terminfo files not supported\n",
+                              _nc_progname);
+               MAIN_LEAKS();
+               ExitProgram(EXIT_FAILURE);
 #endif
-               } else {
-                   if (itrace)
-                       (void) fprintf(stderr,
-                                      "infocmp: reading entry %s from database\n",
-                                      tname[termcount]);
+           } else {
+               if (itrace)
+                   (void) fprintf(stderr,
+                                  "%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 */
-               }
+               status = _nc_read_entry(tname[termcount],
+                                       tfile[termcount],
+                                       &entries[termcount].tterm);
+           }
 
-               if (status <= 0) {
-                   (void) fprintf(stderr,
-                                  "infocmp: couldn't open terminfo file %s.\n",
-                                  tfile[termcount]);
-                   ExitProgram(EXIT_FAILURE);
-               }
-               repair_acsc(&entries[termcount].tterm);
-               termcount++;
+           if (status <= 0) {
+               (void) fprintf(stderr,
+                              "%s: couldn't open terminfo file %s.\n",
+                              _nc_progname,
+                              tfile[termcount]);
+               MAIN_LEAKS();
+               ExitProgram(EXIT_FAILURE);
            }
+           repair_acsc(&entries[termcount].tterm);
+           termcount++;
        }
 
 #if NCURSES_XNAMES
@@ -1541,7 +1652,8 @@ main(int argc, char *argv[])
            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]);
@@ -1552,12 +1664,12 @@ main(int argc, char *argv[])
                           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;
@@ -1565,7 +1677,8 @@ main(int argc, char *argv[])
            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;
@@ -1573,14 +1686,15 @@ main(int argc, char *argv[])
            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,
@@ -1591,7 +1705,7 @@ main(int argc, char *argv[])
                                          || 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;
            }
        }
@@ -1605,7 +1719,7 @@ main(int argc, char *argv[])
     else
        file_comparison(argc - optind, argv + optind);
 
-    free(tfile);
+    MAIN_LEAKS();
     ExitProgram(EXIT_SUCCESS);
 }