This commit was generated by cvs2svn to compensate for changes in r33011,

which included commits to RCS files with non-trunk default branches.

11 files changed, 201 insertions, 46 deletions

diff --git a/contrib/global/COPYING b/contrib/global/COPYING
new file mode 100644
index 0000000..fb3baa4
--- /dev/null
+++ b/contrib/global/COPYING
@@ -0,0 +1,77 @@
+
+           @@@@@@@=
+	 @=       @=
+	@=                                          @=
+	@=            @=    @@@@@= @@@@@@=     @@=  @=
+	@=  F o r   a l l   h a c k e r s.    @=@=  @=
+	@=     @@@@@@=@=   @=    @= @@@@@=   @= @=  @=
+	@=        @=  @=   @=    @= @=   @= @@@@@=  @=
+	 @=       @=  @=   @=    @= @=   @=@=   @=  @=
+	  @@@@@@@@=   @@@@= @@@@@= @@@@@@=@@@= @@@@= @@@@@@=
+
+This software is covered by the following:
+
+     Copyright (c) 1996, 1997, 1998  Shigio Yamaguchi. All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions
+     are met:
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+     3. All advertising materials mentioning features or use of this software
+        must display the following acknowledgement:
+          This product includes software developed by Shigio Yamaguchi.
+     4. Neither the name of the author nor the names of any co-contributors
+        may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+     
+     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+     SUCH DAMAGE.
+
+Portions of gozilla(1) are covered by the following:
+
+     Copyright 1996 Netscape Communications Corporation, all rights reserved.
+     Created: Jamie Zawinski <jwz@netscape.com>, 24-Dec-94.
+
+     Permission to use, copy, modify, distribute, and sell this software and
+     its documentation for any purpose is hereby granted without fee, provided
+     that the above copyright notice appear in all copies and that both that
+     copyright notice and this permission notice appear in supporting documen-
+     tation.  No representations are made about the suitability of this soft-
+     ware for any purpose.  It is provided "as is" without express or implied
+     warranty.
+
+			 Copyright 1991 by Andreas Stolcke
+		     Copyright 1990 by Solbourne Computer Inc.
+				Longmont, Colorado
+
+			       All Rights Reserved.
+
+     Permission to use, copy, modify, and distribute this software and its
+     documentation  for  any  purpose  and  without  fee is hereby granted,
+     provided that the above copyright notice appear  in  all copies and that
+     both  that  copyright  notice  and  this  permission notice appear in
+     supporting  documentation,  and  that  the name of Solbourne not be used
+     in advertising in publicity pertaining to distribution of the  software
+     without specific, written prior permission.
+
+     ANDREAS STOLCKE AND SOLBOURNE COMPUTER INC. DISCLAIMS ALL WARRANTIES WITH
+     REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MER-
+     CHANTABILITY  AND	FITNESS,  IN  NO  EVENT SHALL ANDREAS STOLCKE OR SOL-
+     BOURNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+     ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+     WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+     ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE OR PERFORMANCE OF THIS
+     SOFTWARE.
diff --git a/contrib/global/HISTORY b/contrib/global/HISTORY
index 1f26bbb..d850075 100644
--- a/contrib/global/HISTORY
+++ b/contrib/global/HISTORY
@@ -1,11 +1,11 @@
 GLOBAL history
 --------------
 
-version 1.0	initial version [21-Apr-96]
+version 1.0	Initial version [21-Apr-96]
 
 	global, gtags, btreeop, extended ctags.
 
-version 1.1	only bugfix [2-May-96]
+version 1.1	Only bugfix [2-May-96]
 
 	[fixed bug]
 	global	- makes corrupted path name by conversion error.
@@ -16,7 +16,7 @@ version 1.1	only bugfix [2-May-96]
 		to be a function name. With the result that GRTAGS becomes
 		too large.
 
-version 1.2	support of 1.34 nvi [7-Jun-96]
+version 1.2	Support of 1.34 nvi [7-Jun-96]
 
 	[changed]
 	extended ctags
@@ -28,7 +28,7 @@ version 1.2	support of 1.34 nvi [7-Jun-96]
 	extended vi
 		- VI tag support.
 
-version 1.3	support of GTAGSLIBPATH [28-Jul-96]
+version 1.3	Support of GTAGSLIBPATH [28-Jul-96]
 
 	[changed]
 	global  - search not only in a source tree but also in library paths
@@ -36,7 +36,7 @@ version 1.3	support of GTAGSLIBPATH [28-Jul-96]
 	extended ctags
 		- change print format a little when -x option
 
-version 1.4	support of yacc source file [26-Oct-96]
+version 1.4	Support of yacc source file [26-Oct-96]
 
 	[changed]
 	extended ctags
@@ -46,7 +46,7 @@ version 1.4	support of yacc source file [26-Oct-96]
 		    (original only 3rd part)
 		  * no longer considers a yacc rule to be an object.
 
-version 1.5	hypertext generator [12-Dec-96]
+version 1.5	Hypertext generator [12-Dec-96]
 
 	[fixed bug]
 	gtags	- treat 'y.tab.c' as a C source.(we should treat only *.y)
@@ -58,7 +58,7 @@ version 1.5	hypertext generator [12-Dec-96]
 	htags	- new command (hypertext generator of C source file)
 	gtags	- error check code added.
 
-version 1.6	support of 1.76 nvi and reconstruction for other OS [21-Jan-97]
+version 1.6	Support of 1.76 nvi and reconstruction for other OS [21-Jan-97]
 
 	[changed]
 	htags	- cease using <BLOCKQUOTE> because lynx doesn't understand it.
@@ -82,7 +82,7 @@ version 1.6	support of 1.76 nvi and reconstruction for other OS [21-Jan-97]
 
 	global	- -a option added.
 
-version 1.7	make suitable for large project (mainly FreeBSD kernel) [17-Feb-97]
+version 1.7	Make suitable for large project (mainly FreeBSD kernel) [17-Feb-97]
 
 	[changed]
 	htags	- htags no longer makes frame.html. Index.html offers frame
@@ -103,7 +103,7 @@ version 1.7	make suitable for large project (mainly FreeBSD kernel) [17-Feb-97]
 		- script to make all tags (GTAGS,GRTAGS,HTML) for kernel source.
 		  (it is only for FreeBSD and Linux)
 
-version 1.8	fix some bugs, add options and make more portable [5-Apr-97]
+version 1.8	Fix some bugs, add options and make more portable [5-Apr-97]
 
 	[changed]
 	gctags, btreeop, Makefile
@@ -135,7 +135,7 @@ version 1.8	fix some bugs, add options and make more portable [5-Apr-97]
 	htags	- -d tagdir option added.
 		- -w option added.
 
-version 1.81	make global to understand 'obj' directory [14-Apr-97]
+version 1.81	Make global to understand 'obj' directory [14-Apr-97]
 
 	[fixed bug]
 	extended vi
@@ -144,7 +144,7 @@ version 1.81	make global to understand 'obj' directory [14-Apr-97]
 	global
 		- can find tag file in obj directory.
 
-version 1.9	support of 1.79 nvi and some additional options [21-Apr-97]
+version 1.9	Support of 1.79 nvi and some additional options [21-Apr-97]
 
 	[fixed bug]
 	htags   - doesn't keep the code formatted correctly.
@@ -268,7 +268,7 @@ version 2.1	Symbol search, incremental update and gozilla [20-Sep-97]
 		- gtags-find-pattern command (ESC-g) added.
 		  It is equal to global's -g option.
 
-version 2.11	only bugfix [7-Nov-97]
+version 2.11	Only bugfix [7-Nov-97]
 
 	[fixed bug]
 	htags, gtags
@@ -291,7 +291,7 @@ version 2.2	Rewritten with C for performance [7-Dec-97]
 	htags	- shape up anchor database.
 	btreeop	- some options (-b, -c, -l, -p) were deleted.
 
-version 2.21	bugfix and slightly modified [11-Dec-97]
+version 2.21	Bugfix and slightly modified [11-Dec-97]
 
 	[fixed bug]
 	gtags, global
@@ -313,3 +313,45 @@ version 2.21	bugfix and slightly modified [11-Dec-97]
 
 	htags/Makefile, systags/Makefile
 		- ${DESTDIR}/usr/bin  -> ${DESTDIR}${BINDIR}
+
+version 2.22	GRTAGS support for assembler source [26-Dec-97]
+
+	[changed]
+	gtags, gctags, htags
+		- recognize following patterns as a function reference
+		  to C function xxx().
+			call EXT(xxx)
+			call _xxx
+
+		Thanks to Yamashita TAKAO for his idea.
+
+version 2.23	Bugfix and slightly modified [13-Jan-98]
+
+	[fixed bug]
+	gctags	- GRTAGS support in version 2.22 doesn't work.
+
+		Thanks to Yamashita TAKAO for his bug report.
+
+	[changed]
+	gctags/Makefile, gctags/Makefile.generic
+		- -DGLOBAL -DYACC was removed.
+	gctags/ctags.h
+		- #define GLOBAL 1 and #define YACC 1 were added.
+
+	[added]
+	COPYING	- Copyright notice was added.
+
+version 2.24	Only bugfix [20-Jan-98]
+
+	[fixed bug]
+	global	- generates wrong path name when GTAGSROOT includes symbolic
+		  links.
+
+		Thanks to Wolfgang Helbig for his bug report.
+
+	htags	- cannot treat path name which includes digit as the second
+		  character like 'i386'. (In fact it was expand(1)'s bug.)
+
+		Thanks to Andrew Gallatin for his bug report.
+
+	global	- doesn't search 'obj' directory correctly.
diff --git a/contrib/global/INSTALL b/contrib/global/INSTALL
index 98bd20c..d958971 100644
--- a/contrib/global/INSTALL
+++ b/contrib/global/INSTALL
@@ -1,7 +1,7 @@
 
-Installation of GLOBAL 2.21
+Installation of GLOBAL
 
-						11-Dec-1997 Shigio Yamaguchi
+						20-Jan-1998 Shigio Yamaguchi
 ---------------------------------------------------------------------------
 Guide line (C style)
 ---------------------------------------------------------------------------
@@ -49,8 +49,10 @@ Install procedure
 
 0. Extracting
 
-	% tar xzvf global-2.21.tar.gz
-	% cd global-2.21
+	% tar xzvf global-XXX.tar.gz
+	% cd global-XXX
+
+	(XXX is version number.)
 
 1. Preparation for generic UNIX
 
diff --git a/contrib/global/MANIFEST b/contrib/global/MANIFEST
index 82354c9..bf01ee8 100644
--- a/contrib/global/MANIFEST
+++ b/contrib/global/MANIFEST
@@ -1,3 +1,4 @@
+COPYING			Copyright notice.
 HISTORY			Histroy of GLOBAL.
 INSTALL			Installation method
 MANIFEST		This file.
@@ -10,6 +11,7 @@ VERSION			Version number.
 btreeop/		Btreeop command directory.
 global/			Global command directory.
 gozilla/		Gozilla command directory.
+gctags/			Extended ctags command directory.
 gtags/			Gtags command directory.
 htags/			Htags command directory.
 systags/		Script for kernel.
diff --git a/contrib/global/README b/contrib/global/README
index f4699f2..584c818 100644
--- a/contrib/global/README
+++ b/contrib/global/README
@@ -3,15 +3,16 @@
 	 @=       @=
 	@=                                          @=
 	@=            @=    @@@@@= @@@@@@=     @@=  @=
-	@=  F o r   a l l   h a c k e r s.    version 2.21
+	@=  F o r   a l l   h a c k e r s.
 	@=     @@@@@@=@=   @=    @= @@@@@=   @= @=  @=
 	@=        @=  @=   @=    @= @=   @= @@@@@=  @=
 	 @=       @=  @=   @=    @= @=   @=@=   @=  @=
 	  @@@@@@@@=   @@@@= @@@@@= @@@@@@=@@@= @@@@= @@@@@@=
 
-					Shigio Yamaguchi	11-Dec-97
+					Shigio Yamaguchi	20-Jan-98
 
-		Copyright 1996, 1997 Shigio Yamaguchi All right resereved.
+		Copyright 1996, 1997, 1998
+			Shigio Yamaguchi All right resereved.
 
 	----------------------------------------------------------
 	Note:
diff --git a/contrib/global/VERSION b/contrib/global/VERSION
index 2ef40bd..fd6915c 100644
--- a/contrib/global/VERSION
+++ b/contrib/global/VERSION
@@ -1 +1 @@
-2.21
+2.24
diff --git a/contrib/global/gctags/Makefile b/contrib/global/gctags/Makefile
index e60217f..bdecdfb 100644
--- a/contrib/global/gctags/Makefile
+++ b/contrib/global/gctags/Makefile
@@ -1,5 +1,5 @@
 PROG=	gctags
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../lib -DGLOBAL -DYACC
+CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../lib
 LDADD=  $(LIBUTIL)
 DPADD=  $(LIBUTIL)
 SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c assembler.c
diff --git a/contrib/global/gctags/assembler.c b/contrib/global/gctags/assembler.c
index 2cd2d07..44d5aec 100644
--- a/contrib/global/gctags/assembler.c
+++ b/contrib/global/gctags/assembler.c
@@ -35,9 +35,12 @@
 static char sccsid[] = "@(#)assembler.c	8.3 (Berkeley) 6/6/97";
 #endif /* LIBC_SCCS and not lint */
 
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "ctags.h"
+#include "lookup.h"
 
 #ifdef GLOBAL
 void
@@ -52,22 +55,51 @@ asm_entries()
 		if (!fgets(lbuf, sizeof(lbuf), inf))
 			return;
 		++lineno;
-		/* extract only ENTRY() and ALTENTRY(). */
-		if (lbuf[0] != 'E' && lbuf[0] != 'A')
-			continue;
-		lbp = lbuf;
-		if (!strncmp(lbp, "ENTRY(", 6)) {
-			lbp += 6;
-		} else if (!strncmp(lbp, "ALTENTRY(", 9)) {
-			lbp += 9;
-		} else
-			continue;
-		sp = tok;
-		while (*lbp && intoken(*lbp))
-			*sp++ = *lbp++;
-		if (*lbp != ')')
-			continue;
-		*sp = EOS;
+		if (rflag) {
+			/* extract only call EXT(xxx) or call _xxx */
+			lbp = lbuf;
+			while (*lbp && isspace(*lbp))
+				lbp++;
+			if (*lbp != 'c' || strncmp(lbp, "call", 4))
+				continue;
+			lbp += 4;
+			while (*lbp && isspace(*lbp))
+				lbp++;
+			sp = tok;
+			if (!strncmp(lbp, "EXT(" /* ) */, 4)) {
+				lbp += 4;
+				while (*lbp && intoken(*lbp))
+					*sp++ = *lbp++;
+				if (*lbp != /* ( */ ')')
+					continue;
+				*sp = EOS;
+			} else if (*lbp == '_') {
+				lbp++;
+				while (*lbp && intoken(*lbp))
+					*sp++ = *lbp++;
+				*sp = EOS;
+			} else
+				continue;
+			if (!lookup(tok))
+				continue;
+		} else {
+			/* extract only ENTRY() and ALTENTRY(). */
+			if (lbuf[0] != 'E' && lbuf[0] != 'A')
+				continue;
+			lbp = lbuf;
+			if (!strncmp(lbp, "ENTRY(", 6)) {
+				lbp += 6;
+			} else if (!strncmp(lbp, "ALTENTRY(", 9)) {
+				lbp += 9;
+			} else
+				continue;
+			sp = tok;
+			while (*lbp && intoken(*lbp))
+				*sp++ = *lbp++;
+			if (*lbp != /* ( */ ')')
+				continue;
+			*sp = EOS;
+		}
 		getline();
 		pfnote(tok, lineno);
 	}
diff --git a/contrib/global/gctags/ctags.c b/contrib/global/gctags/ctags.c
index 0253ab5..d79a348 100644
--- a/contrib/global/gctags/ctags.c
+++ b/contrib/global/gctags/ctags.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char rcsid[] =
-	"$Id: ctags.c,v 1.3 1997/07/10 06:43:40 charnier Exp $";
+	"$Id: ctags.c,v 1.1.1.2 1997/12/15 23:08:35 cwt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <limits.h>
diff --git a/contrib/global/gtags/Makefile b/contrib/global/gtags/Makefile
index 803253c..9afed80 100644
--- a/contrib/global/gtags/Makefile
+++ b/contrib/global/gtags/Makefile
@@ -1,5 +1,5 @@
 PROG=	gtags
-CFLAGS+=-I${.CURDIR}/../lib -DGLOBAL -DYACC
+CFLAGS+=-I${.CURDIR}/../lib
 LDADD=  $(LIBUTIL)
 DPADD=	$(LIBUTIL)
 
diff --git a/contrib/global/htags/htags.pl b/contrib/global/htags/htags.pl
index 3ac1207..e4e6de8 100644
--- a/contrib/global/htags/htags.pl
+++ b/contrib/global/htags/htags.pl
@@ -29,7 +29,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	htags.pl				31-Oct-97
+#	htags.pl				20-Jan-98
 #
 $com = $0;
 $com =~ s/.*\///;
@@ -429,7 +429,6 @@ sub makeline {
 	$_[0] =~ s/^$tag/<A HREF=..\/$SRCS\/$filename.html#$lno>$tag<\/A>/;
 }
 sub makedupindex {
-	local($expand) = &'usable('expand') ? 'expand' : 'cat';
 	local($count) = 0;
 
 	foreach $db ('GRTAGS', 'GTAGS') {
@@ -774,10 +773,10 @@ sub makehtml {
 
 		$count++;
 		chop;
-		s/^\.\///;
 		local($path) = $_;
+		$path =~ s/^\.\///;
+		print STDERR " [$count/$total] converting $path\n" if ($vflag);
 		$path =~ s/\//$SEP/g;
-		print STDERR " [$count/$total] converting $_\n" if ($vflag);
 		&convert'src2html($_, "$html/$SRCS/$path.html");
 	}
 	close(FIND);
@@ -805,12 +804,12 @@ sub src2html {
 	#
 	# load tags belonging to this file.
 	#
-	$file =~ s/^\.\///;
 	&anchor'load($file);
 	open(C, "$expand '$file' |") || &'error("cannot open file '$file'.");
 	#
 	# print the header
 	#
+	$file =~ s/^\.\///;
 	print "<HTML>\n<HEAD><TITLE>$file</TITLE></HEAD>\n";
 	print "<BODY><A NAME=TOP><H2>$file</H2>\n";
 	print &link_format(&anchor'getlinks(0));
@@ -891,7 +890,7 @@ sub src2html {
 					$href = "<A HREF=../$dir/$TAG.html>$TAG</A>";
 				}
 				# set tag marks and save hyperlink into @links
-				if (s/\b$TAG\b/\005$count\005/) {
+				if (s/\b$TAG\b/\005$count\005/ || s/\b_$TAG\b/_\005$count\005/) {
 					$count++;
 					push(@links, $href);
 				} else {