X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Finfocmp.c;h=62773d634abc1e7c2ae9acfb64f0a8e94c0d77a8;hp=1c02ba19698a6b36017f94400abe3bd472561b0a;hb=692356778a199ba045250acb256aabe921aa98f2;hpb=21c8ffa0edf2e389f3f674f0c08009002c6f357d diff --git a/progs/infocmp.c b/progs/infocmp.c index 1c02ba19..62773d63 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.134 2015/08/22 23:54:25 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.136 2015/09/05 15:49:57 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -989,7 +989,8 @@ file_comparison(int argc, char *argv[]) int i, n; memset(heads, 0, sizeof(heads)); - dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE, FALSE); + dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE, + FALSE, FALSE); for (n = 0; n < argc && n < MAXCOMPARE; n++) { if (freopen(argv[n], "r", stdin) == 0) @@ -1197,6 +1198,7 @@ usage(void) ," -l output terminfo names" ," -n list capabilities in neither" ," -p ignore padding specifiers" + ," -Q number dump compiled description" ," -q brief listing, removes headers" ," -r with -C, output in termcap form" ," -r with -F, resolve use-references" @@ -1506,6 +1508,7 @@ main(int argc, char *argv[]) int initdump = 0; bool init_analyze = FALSE; bool suppress_untranslatable = FALSE; + int quickdump = 0; /* where is the terminfo database location going to default to? */ restdir = firstdir = 0; @@ -1527,7 +1530,7 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, - "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) { + "01A:aB:CcDdEeFfGgIiKLlnpQ:qR:rs:TtUuVv:w:x")) != -1) { switch (c) { case '0': mwidth = 65535; @@ -1628,6 +1631,10 @@ main(int argc, char *argv[]) ignorepads = TRUE; break; + case 'Q': + quickdump = optarg_to_number(); + break; + case 'q': quiet = TRUE; s_absent = "-"; @@ -1751,7 +1758,7 @@ main(int argc, char *argv[]) /* set up for display */ dump_init(tversion, outform, sortmode, mwidth, mheight, itrace, - formatted, FALSE); + formatted, FALSE, quickdump); if (!filecompare) { /* grab the entries */ @@ -1852,8 +1859,10 @@ main(int argc, char *argv[]) "%s: about to dump %s\n", _nc_progname, tname[0]); - (void) printf("#\tReconstructed via infocmp from file: %s\n", - tfile[0]); + if (!quiet) + (void) + printf("#\tReconstructed via infocmp from file: %s\n", + tfile[0]); dump_entry(&entries[0].tterm, suppress_untranslatable, limited,