# HG changeset patch # User Francesco Potort # Date 1132322204 0 # Node ID bf8620d8ff03b0676a874cd98a340864a1cb0e6c # Parent 9d0a2cc054be5c5373f4dac0ae3b28c43e7d468f Cxref mode writes to stdout: do not close tagf, which has never been opened. Specify in the --help that vgrind writes to stdout. diff -r 9d0a2cc054be -r bf8620d8ff03 lib-src/etags.c --- a/lib-src/etags.c Fri Nov 18 03:57:36 2005 +0000 +++ b/lib-src/etags.c Fri Nov 18 13:56:44 2005 +0000 @@ -41,7 +41,7 @@ * configuration file containing regexp definitions for etags. */ -char pot_etags_version[] = "@(#) pot revision number is 17.14"; +char pot_etags_version[] = "@(#) pot revision number is 17.15"; #define TRUE 1 #define FALSE 0 @@ -479,7 +479,7 @@ /* STDIN is defined in LynxOS system headers */ #ifdef STDIN -#undef STDIN +# undef STDIN #endif #define STDIN 0x1001 /* returned by getopt_long on --parse-stdin */ @@ -994,9 +994,9 @@ if (CTAGS) { puts ("-v, --vgrind\n\ - Generates an index of items intended for human consumption,\n\ - similar to the output of vgrind. The index is sorted, and\n\ - gives the page number of each item."); + Print on the standard output an index of items intended for\n\ + human consumption, similar to the output of vgrind. The index\n\ + is sorted, and gives the page number of each item."); puts ("-w, --no-warn\n\ Suppress warning messages about entries defined in multiple\n\ files."); @@ -1428,7 +1428,8 @@ if (!CTAGS || cxref_style) { - put_entries (nodehead); /* write the remaining tags (ETAGS) */ + /* Write the remaining tags to tagf (ETAGS) or stdout (CXREF). */ + put_entries (nodehead); free_tree (nodehead); nodehead = NULL; if (!CTAGS) @@ -1442,10 +1443,11 @@ while (nincluded_files-- > 0) fprintf (tagf, "\f\n%s,include\n", *included_files++); + + if (fclose (tagf) == EOF) + pfatal (tagfile); } - if (fclose (tagf) == EOF) - pfatal (tagfile); exit (EXIT_SUCCESS); }