fixing inverted patch to be upstream friendly

This commit is contained in:
Neil Horman 2004-10-05 17:10:33 +00:00
parent d0f50a9418
commit 6639cc3d63
2 changed files with 38 additions and 16 deletions

View File

@ -1,15 +1,33 @@
--- cscope-15.5/src/dir.c.orig 2004-09-28 14:43:17.706427680 -0400 --- cscope/src/crossref.c.orig 2003-04-29 10:08:45.000000000 -0400
+++ cscope-15.5/src/dir.c 2004-09-28 15:29:27.566344968 -0400 +++ cscope/src/crossref.c 2004-10-05 10:37:19.958700472 -0400
@@ -504,7 +505,11 @@ @@ -95,10 +95,16 @@
#endif int token; /* current token */
&& issrcfile(mybasename(path)) struct stat st;
&& infilelist(path) == NO) {
- addsrcfile(path); + filename = srcfile;
+ /* if the file is a symlink, make sure + putfilename(srcfile); /* output the file name */
+ * it points to a real file */ + dbputc('\n');
+ if(S_ISREG(buf.st_mode) || + dbputc('\n');
+ (S_ISLNK(buf.st_mode) && (stat(path,&buf) == 0))) +
+ addsrcfile(path); if (! ((stat(srcfile, &st) == 0)
} && S_ISREG(st.st_mode))) {
cannotopen(srcfile);
errorsfound = YES;
+ dbputc('\t');
return;
} }
@@ -107,12 +113,9 @@
if ((yyin = myfopen(srcfile, "r")) == NULL) {
cannotopen(srcfile);
errorsfound = YES;
+ dbputc('\t');
return;
} }
- filename = srcfile; /* save the file name for warning messages */
- putfilename(srcfile); /* output the file name */
- dbputc('\n');
- dbputc('\n');
/* read the source file */
initscanner(srcfile);

View File

@ -1,7 +1,7 @@
Summary: C source code tree search and browse tool Summary: C source code tree search and browse tool
Name: cscope Name: cscope
Version: 15.5 Version: 15.5
Release: 2 Release: 3
Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz
URL: http://cscope.sourceforge.net URL: http://cscope.sourceforge.net
License: BSD License: BSD
@ -81,6 +81,10 @@ rm -f %{xemacs_lisp_path}/xcscope.el
rm -f %{emacs_lisp_path}/xcscope.el rm -f %{emacs_lisp_path}/xcscope.el
%changelog %changelog
* Tue Oct 5 2004 Neil Horman <nhorman@redhat.com>
- modified cscope-15.5.-inverted patch to be upstream
friendly
* Tue Sep 28 2004 Neil Horman <nhorman@redhat.com> * Tue Sep 28 2004 Neil Horman <nhorman@redhat.com>
- fixed inverted index bug (bz 133942) - fixed inverted index bug (bz 133942)