d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Painless merge...

Browse Source
This commit is contained in:
cwt 1998-02-02 05:42:16 +00:00
parent 21500fe3a2
commit 94da1d663c
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/global/gctags/ctags.h
View File

@ -33,6 +33,10 @@
* @(#)ctags.h 8.3 (Berkeley) 4/2/94
*/
/* Definition for gctags */
#define GLOBAL 1
#define YACC 1
#define bool char
#define YES 1

4
contrib/global/gtags/gtags.c
View File

@ -270,9 +270,9 @@ int db;
tagopen(dbpath, db, 1);
for (findopen(); (path = findread(NULL)) != NULL; ) {
/*
* GRTAGS and GSYMS doesn't treat asembler.
* GSYMS doesn't treat asembler.
*/
if (db != GTAGS) {
if (db == GSYMS) {
char *p = path + strlen(path) - 1;
if ((*p == 's' || *p == 'S') && *(p - 1) == '.')
continue;

5
contrib/global/lib/getdbpath.c
View File

@ -69,7 +69,7 @@ char *dbpath;
if (bsd) {
sprintf(path, "%s/%s/GTAGS", candidate, makeobjdir);
if (test("fr", path)) {
sprintf(dbpath, "%s%s", candidate, makeobjdir);
sprintf(dbpath, "%s/%s", candidate, makeobjdir);
return 1;
}
sprintf(path, "%s%s/GTAGS", makeobjdirprefix, candidate);
@ -126,7 +126,8 @@ char *dbpath;
die("GTAGSROOT must be an absolute path.");
if (stat(p, &sb) || !S_ISDIR(sb.st_mode))
die1("directory '%s' not found.", p);
strcpy(root, p);
if (realpath(p, root) == NULL)
die1("cannot get real path of '%s'.", p);
/*
* GTAGSDBPATH is meaningful only when GTAGSROOT exist.
*/