From cdfea3c9617380427c935bfd15755052ade0c744 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 28 Sep 2004 19:46:27 +0000 Subject: [PATCH] fixing bz 133942 --- .cvsignore | 1 + cscope-15.5-inverted.patch | 15 +++++++++++++++ cscope.spec | 7 ++++++- sources | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 cscope-15.5-inverted.patch diff --git a/.cvsignore b/.cvsignore index 83d1382..7a7d156 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ cscope-15.5.tar.gz +cscope-15.5-inverted.patch diff --git a/cscope-15.5-inverted.patch b/cscope-15.5-inverted.patch new file mode 100644 index 0000000..9a74a00 --- /dev/null +++ b/cscope-15.5-inverted.patch @@ -0,0 +1,15 @@ +--- cscope-15.5/src/dir.c.orig 2004-09-28 14:43:17.706427680 -0400 ++++ cscope-15.5/src/dir.c 2004-09-28 15:29:27.566344968 -0400 +@@ -504,7 +505,11 @@ + #endif + && issrcfile(mybasename(path)) + && infilelist(path) == NO) { +- addsrcfile(path); ++ /* if the file is a symlink, make sure ++ * it points to a real file */ ++ if(S_ISREG(buf.st_mode) || ++ (S_ISLNK(buf.st_mode) && (stat(path,&buf) == 0))) ++ addsrcfile(path); + } + } + } diff --git a/cscope.spec b/cscope.spec index bad6bcf..bf927a4 100644 --- a/cscope.spec +++ b/cscope.spec @@ -1,7 +1,7 @@ Summary: C source code tree search and browse tool Name: cscope Version: 15.5 -Release: 1 +Release: 2 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz URL: http://cscope.sourceforge.net License: BSD @@ -17,6 +17,7 @@ Patch0:cscope-15.5-ocs.patch Patch1:cscope-15.5-findassign.patch Patch2:cscope-15.5-ocs-dash_s_fix.patch Patch3:cscope-15.5-xcscope-man.patch +Patch4:cscope-15.5-inverted.patch %description cscope is a mature, ncurses based, C source code tree browsing tool. It @@ -31,6 +32,7 @@ matches for use in file editing. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure @@ -79,6 +81,9 @@ rm -f %{xemacs_lisp_path}/xcscope.el rm -f %{emacs_lisp_path}/xcscope.el %changelog +* Tue Sep 28 2004 Neil Horman +- fixed inverted index bug (bz 133942) + * Mon Sep 13 2004 Frank Ch. Eigler - bumped release number to a plain "1" diff --git a/sources b/sources index a8d2017..fa961e4 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ beb6032a301bb11524aec74bfb5e4840 cscope-15.5.tar.gz +7e3026d250cff720a75f5629d341ffac cscope-15.5-inverted.patch