New upstream release 15.7a, fixing CVE-2009-014815-7a-1

2 files changed, 20 insertions, 11 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index a0e2233..dd4e9f7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -35,10 +35,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+LIBOBJDIR =
 subdir = doc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -76,6 +78,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GNOME_LINUX_FALSE = @GNOME_LINUX_FALSE@
 GNOME_LINUX_TRUE = @GNOME_LINUX_TRUE@
+GREP = @GREP@
 HAS_CURSES_FALSE = @HAS_CURSES_FALSE@
 HAS_CURSES_TRUE = @HAS_CURSES_TRUE@
 HAS_GNOME_FALSE = @HAS_GNOME_FALSE@
@@ -109,8 +112,8 @@ USING_LEX_FALSE = @USING_LEX_FALSE@
 USING_LEX_TRUE = @USING_LEX_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -125,6 +128,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gnome1 = @gnome1@
 gnome2 = @gnome2@
@@ -133,17 +139,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
diff --git a/doc/cscope.1 b/doc/cscope.1
index 3a6a6e6..6a3a86b 100644
--- a/doc/cscope.1
+++ b/doc/cscope.1
@@ -1,5 +1,5 @@
 .PU
-.TH CSCOPE "1" "August 2003" "The Santa Cruz Operation"
+.TH CSCOPE "1" "January 2007" "The Santa Cruz Operation"
 .SH NAME
 cscope - interactively examine a C program 
 .SH SYNOPSIS
@@ -9,7 +9,7 @@ cscope - interactively examine a C program
 .BI [\-f reffile ]
 .BI [\-I incdir ]
 .BI [\-i namefile ]
-.BI [\-[ 0123456789 ] pattern ]
+.BI [\-0123456789 pattern ]
 .BI [\-p n ]
 .BI [\-s dir ]
 .BI [ files ]
@@ -44,7 +44,7 @@ cross-reference is rebuilt, the data for the unchanged files are
 copied from the old cross-reference, which makes rebuilding faster
 than the initial build.
 .SH OPTIONS  
-Some command line arguments can only occur as the the ony argument in
+Some command line arguments can only occur as the only argument in
 the execution of cscope.  They cause the program to just print out
 some output and exit immediately:
 .TP
@@ -86,7 +86,7 @@ Read symbol reference lines from
 .I symfile. 
 (A symbol reference
 file is created by > and >>, and can also be read using the <
-command, described under ``Issuing Subsequent Requests,''
+command, described under ``Issuing Subsequent Requests'',
 below.)
 .TP
 .BI -f reffile
@@ -153,7 +153,7 @@ Display the last
 .I n 
 file path components instead of the default (1). Use 
 .I 0 
-to not display the file name at all.
+not to display the file name at all.
 .TP
 .B -q
 Enable fast symbol lookup via an inverted index. This option
@@ -194,7 +194,7 @@ A list of file names to operate on.
 .PP
 The -I, -c, -k, -p, -q, and -T options can also be in the cscope.files file.
 .PP
-.B Requesting the initial search
+.SS Requesting the initial search
 .PP
 After the cross-reference is ready, cscope will display this menu:
 .PP
@@ -221,7 +221,7 @@ After the cross-reference is ready, cscope will display this menu:
 Press the <Up> or <Down> keys repeatedly to move to the desired input
 field, type the text to search for, and then press the <Return> key.
 .PP
-.SH "Issuing subsequent requests"
+.SS "Issuing subsequent requests"
 If the search is successful, any of these single-character commands
 can be used:
 .TP
@@ -357,7 +357,6 @@ Redraw the screen.
 Give help information about cscope commands.
 .TP
 .B  Special keys
-.PP
 If your terminal has arrow keys that work in vi, you can use them
 to move around the input fields. The up-arrow key is useful to move to
 the previous
@@ -365,7 +364,7 @@ input field instead of using the <Tab> key repeatedly. If you have
 <CLEAR>, <NEXT>, or <PREV> keys they will act as the ^l, +, and -
 commands, respectively.
 .PP   
-.B Line-Oriented interface
+.SS Line-Oriented interface
 .PP  
 The -l option lets you use cscope where a screen-oriented interface
 would not be useful, for example, from another screen-oriented