"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "htags/htags.c" between
global-6.6.4.tar.gz and global-6.6.5.tar.gz

About: GNU GLOBAL is a source code tag system that works the same way across diverse environments. It is similar to ctags or etags, but it is independent of any editor.

htags.c  (global-6.6.4):htags.c  (global-6.6.5)
skipping to change at line 44 skipping to change at line 44
#include <fcntl.h> #include <fcntl.h>
#else #else
#include <sys/file.h> #include <sys/file.h>
#endif #endif
#include <signal.h> #include <signal.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <errno.h> #include <errno.h>
#include "args.h"
#include "checkalloc.h"
#include "getopt.h" #include "getopt.h"
#include "regex.h" #include "regex.h"
#include "global.h" #include "global.h"
#include "anchor.h" #include "anchor.h"
#include "cache.h" #include "cache.h"
#include "common.h" #include "common.h"
#include "htags.h" #include "htags.h"
#include "incop.h" #include "incop.h"
#include "path2url.h" #include "path2url.h"
#include "const.h" #include "const.h"
skipping to change at line 256 skipping to change at line 254
int colorize_warned_line = 0; /**< colorize warned line * / int colorize_warned_line = 0; /**< colorize warned line * /
const char *normal_suffix = "html"; /**< suffix of normal html file */ const char *normal_suffix = "html"; /**< suffix of normal html file */
const char *HTML; /**< HTML */ const char *HTML; /**< HTML */
const char *action = "cgi-bin/global.cgi"; /**< default action */ const char *action = "cgi-bin/global.cgi"; /**< default action */
const char *completion_action = "cgi-bin/completion.cgi"; /**< completion_a ction */ const char *completion_action = "cgi-bin/completion.cgi"; /**< completion_a ction */
int definition_header=NO_HEADER; /**< (NO|BEFORE|RIGHT|AFTER)_HEADER */ int definition_header=NO_HEADER; /**< (NO|BEFORE|RIGHT|AFTER)_HEADER */
const char *include_file_suffixes = DEFAULTINCLUDEFILESUFFIXES; /**< incl ude_file_suffixes */ const char *include_file_suffixes = DEFAULTINCLUDEFILESUFFIXES; /**< incl ude_file_suffixes */
static const char *langmap = DEFAULTLANGMAP; /**< langmap */ static const char *langmap = DEFAULTLANGMAP; /**< langmap */
int grtags_is_empty = 0; /**< grta gs_is_empty */ int grtags_is_empty = 0; /**< grta gs_is_empty */
static const char *short_options = "acd:DfFghIm:nNoqst:Tvwx"; const char *short_options = "acC:d:DfFghIm:nNoqst:Tvwx";
static struct option const long_options[] = { struct option const long_options[] = {
/* /*
* These options have long name and short name. * These options have long name and short name.
* We throw them to the processing of short options. * We throw them to the processing of short options.
*/ */
{"alphabet", no_argument, NULL, 'a'}, {"alphabet", no_argument, NULL, 'a'},
{"directory", required_argument, NULL, 'C'},
{"dbpath", required_argument, NULL, 'd'}, {"dbpath", required_argument, NULL, 'd'},
{"dynamic", no_argument, NULL, 'D'}, {"dynamic", no_argument, NULL, 'D'},
{"form", no_argument, NULL, 'f'}, {"form", no_argument, NULL, 'f'},
{"frame", no_argument, NULL, 'F'}, {"frame", no_argument, NULL, 'F'},
{"func-header", optional_argument, NULL, 'h'}, {"func-header", optional_argument, NULL, 'h'},
{"gtags", no_argument, NULL, 'g'}, {"gtags", no_argument, NULL, 'g'},
{"icon", no_argument, NULL, 'I'}, {"icon", no_argument, NULL, 'I'},
{"line-number", optional_argument, NULL, 'n'}, {"line-number", optional_argument, NULL, 'n'},
{"main-func", required_argument, NULL, 'm'}, {"main-func", required_argument, NULL, 'm'},
{"other", no_argument, NULL, 'o'}, {"other", no_argument, NULL, 'o'},
skipping to change at line 303 skipping to change at line 302
{"statistics", no_argument, &statistics, STATISTICS_STYLE_TABLE}, {"statistics", no_argument, &statistics, STATISTICS_STYLE_TABLE},
{"suggest", no_argument, &suggest, 1}, {"suggest", no_argument, &suggest, 1},
{"suggest2", no_argument, &suggest2, 1}, {"suggest2", no_argument, &suggest2, 1},
{"table-list", no_argument, &table_list, 1}, {"table-list", no_argument, &table_list, 1},
{"version", no_argument, &show_version, 1}, {"version", no_argument, &show_version, 1},
{"help", no_argument, &show_help, 1}, {"help", no_argument, &show_help, 1},
/* accept value */ /* accept value */
#define OPT_CVSWEB 128 #define OPT_CVSWEB 128
#define OPT_CVSWEB_CVSROOT 129 #define OPT_CVSWEB_CVSROOT 129
#define OPT_GTAGSCONF 130 #define OPT_NCOL 130
#define OPT_GTAGSLABEL 131 #define OPT_INSERT_FOOTER 131
#define OPT_NCOL 132 #define OPT_INSERT_HEADER 132
#define OPT_INSERT_FOOTER 133 #define OPT_ITEM_ORDER 133
#define OPT_INSERT_HEADER 134 #define OPT_TABS 134
#define OPT_ITEM_ORDER 135 #define OPT_CFLOW 135
#define OPT_TABS 136 #define OPT_AUTO_COMPLETION 136
#define OPT_CFLOW 137 #define OPT_TREE_VIEW 137
#define OPT_AUTO_COMPLETION 138 #define OPT_HTML_HEADER 138
#define OPT_TREE_VIEW 139 #define OPT_CALL_TREE 139
#define OPT_HTML_HEADER 140 #define OPT_CALLEE_TREE 140
#define OPT_CALL_TREE 141
#define OPT_CALLEE_TREE 142
{"auto-completion", optional_argument, NULL, OPT_AUTO_COMPLETION}, {"auto-completion", optional_argument, NULL, OPT_AUTO_COMPLETION},
{"call-tree", required_argument, NULL, OPT_CALL_TREE}, {"call-tree", required_argument, NULL, OPT_CALL_TREE},
{"callee-tree", required_argument, NULL, OPT_CALLEE_TREE}, {"callee-tree", required_argument, NULL, OPT_CALLEE_TREE},
{"cflow", required_argument, NULL, OPT_CFLOW}, {"cflow", required_argument, NULL, OPT_CFLOW},
{"cvsweb", required_argument, NULL, OPT_CVSWEB}, {"cvsweb", required_argument, NULL, OPT_CVSWEB},
{"cvsweb-cvsroot", required_argument, NULL, OPT_CVSWEB_CVSROOT}, {"cvsweb-cvsroot", required_argument, NULL, OPT_CVSWEB_CVSROOT},
{"gtagsconf", required_argument, NULL, OPT_GTAGSCONF}, {"gtagsconf", required_argument, NULL, OPT_GTAGSCONF},
{"gtagslabel", required_argument, NULL, OPT_GTAGSLABEL}, {"gtagslabel", required_argument, NULL, OPT_GTAGSLABEL},
{"html-header", required_argument,NULL, OPT_HTML_HEADER}, {"html-header", required_argument,NULL, OPT_HTML_HEADER},
{"ncol", required_argument, NULL, OPT_NCOL}, {"ncol", required_argument, NULL, OPT_NCOL},
skipping to change at line 1084 skipping to change at line 1081
main(int argc, char **argv) main(int argc, char **argv)
{ {
const char *av = NULL; const char *av = NULL;
int func_total, file_total; int func_total, file_total;
char arg_dbpath[MAXPATHLEN]; char arg_dbpath[MAXPATHLEN];
const char *index = NULL; const char *index = NULL;
int optchar; int optchar;
int option_index = 0; int option_index = 0;
STATISTICS_TIME *tim; STATISTICS_TIME *tim;
arg_dbpath[0] = 0;
basic_check();
/* /*
* Setup GTAGSCONF and GTAGSLABEL environment variable * pick up --gtagsconf, --gtagslabel and --directory (-C).
* according to the --gtagsconf and --gtagslabel option.
*/ */
preparse_options(argc, argv); if (preparse_options(argc, argv) < 0)
usage();
arg_dbpath[0] = 0;
basic_check();
/* /*
* Load configuration values. * Load configuration values.
*/ */
if (!vgetcwd(cwdpath, sizeof(cwdpath))) if (!vgetcwd(cwdpath, sizeof(cwdpath)))
die("cannot get current directory."); die("cannot get current directory.");
openconf(cwdpath); openconf(cwdpath);
configuration(); configuration();
/* /*
* setup_langmap() is needed to use decide_lang(). * setup_langmap() is needed to use decide_lang().
*/ */
skipping to change at line 1143 skipping to change at line 1141
callee_file = optarg; callee_file = optarg;
break; break;
case OPT_CVSWEB: case OPT_CVSWEB:
cvsweb_url = optarg; cvsweb_url = optarg;
break; break;
case OPT_CVSWEB_CVSROOT: case OPT_CVSWEB_CVSROOT:
cvsweb_cvsroot = optarg; cvsweb_cvsroot = optarg;
break; break;
case OPT_GTAGSCONF: case OPT_GTAGSCONF:
case OPT_GTAGSLABEL: case OPT_GTAGSLABEL:
/* These options are already parsed in preparse_options() case 'C':
*/ /* These options are already parsed in preparse_options()
. */
break; break;
case OPT_INSERT_FOOTER: case OPT_INSERT_FOOTER:
insert_footer = optarg; insert_footer = optarg;
break; break;
case OPT_INSERT_HEADER: case OPT_INSERT_HEADER:
insert_header = optarg; insert_header = optarg;
break; break;
case OPT_HTML_HEADER: case OPT_HTML_HEADER:
{ {
STATIC_STRBUF(sb); STATIC_STRBUF(sb);
 End of changes. 8 change blocks. 
24 lines changed or deleted 23 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)