cscope-cvs Mailing List for cscope

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32402/src

Modified Files:
	display.c global.h main.c 
Log Message:
Add -v option for the sake of proposed KDE wrapper "kscope".

Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** display.c	29 Oct 2002 16:45:50 -0000	1.21
--- display.c	12 Jun 2003 17:11:38 -0000	1.22
***************
*** 564,567 ****
--- 564,572 ----
  			refresh();
  		}
+ 		else if (verbosemode == YES)
+ 		{
+ 			sprintf(msg, "> %s %ld of %ld", what, current, max);
+ 		}
+ 
  		start = now;
  		if ((linemode == NO) && (incurses == YES))
***************
*** 577,581 ****
  		}
  		else
! 			if (linemode == NO)
  				postmsg(msg);
  	}
--- 582,586 ----
  		}
  		else
! 			if (linemode == NO || verbosemode == YES)
  				postmsg(msg);
  	}
***************
*** 611,614 ****
--- 616,620 ----
  	if (linemode == YES || incurses == NO) {
  		(void) printf("%s\n", msg);
+ 		fflush(stdout);
  	}
  	else {

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** global.h	2 Mar 2003 20:26:57 -0000	1.23
--- global.h	12 Jun 2003 17:11:38 -0000	1.24
***************
*** 228,231 ****
--- 228,232 ----
  extern	BOOL	kernelmode;	/* don't use DFLT_INCDIR - bad for kernels */
  extern	BOOL	linemode;	/* use line oriented user interface */
+ extern	BOOL	verbosemode;	/* print extra information on line mode */
  extern	BOOL	recurse_dir;	/* recurse dirs when searching for src files */
  extern	char	*namefile;	/* file of file names */

Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** main.c	2 Mar 2003 20:26:57 -0000	1.29
--- main.c	12 Jun 2003 17:11:38 -0000	1.30
***************
*** 91,94 ****
--- 91,95 ----
  BOOL	kernelmode;		/* don't use DFLT_INCDIR - bad for kernels */
  BOOL	linemode = NO;		/* use line oriented user interface */
+ BOOL	verbosemode = NO;	/* print extra information on line mode */
  BOOL	recurse_dir = NO;	/* recurse dirs when searching for src files */
  char	*namefile;		/* file of file names */
***************
*** 200,203 ****
--- 201,207 ----
  				linemode = YES;
  				break;
+ 			case 'v':
+ 				verbosemode = YES;
+ 				break;
  			case 'o':	/* display OGS book and subsystem names */
  				ogs = YES;
***************
*** 522,527 ****
  		/* build the cross-reference */
  		initcompress();
! 		if (linemode == NO )    /* display if verbose as well */
!                     postmsg("Building cross-reference...");    		    
  		build();
  		if (linemode == NO )
--- 526,531 ----
  		/* build the cross-reference */
  		initcompress();
! 		if (linemode == NO || verbosemode == YES)    /* display if verbose as well */
!                     postmsg("Building cross-reference...");
  		build();
  		if (linemode == NO )
***************
*** 772,776 ****
  usage(void)
  {
! 	(void) fprintf(stderr, "Usage: cscope [-bcCdehklLqRTuUV] [-f file] [-F file] [-i file] [-I dir] [-s dir]\n");
  	(void) fprintf(stderr, "              [-p number] [-P path] [-[0-8] pattern] [source files]\n");
  }
--- 776,780 ----
  usage(void)
  {
! 	(void) fprintf(stderr, "Usage: cscope [-bcCdehklLqRTuUvV] [-f file] [-F file] [-i file] [-I dir] [-s dir]\n");
  	(void) fprintf(stderr, "              [-p number] [-P path] [-[0-8] pattern] [source files]\n");
  }
***************
*** 805,808 ****
--- 809,813 ----
  	(void) fprintf(stderr, "-U            Check file time stamps.\n");
  	(void) fprintf(stderr, "-u            Unconditionally build the cross-reference file.\n");
+ 	(void) fprintf(stderr, "-v            Be more verbose in line mode.\n");
  	(void) fprintf(stderr, "-V            Print the version number.\n");
  	(void) fprintf(stderr, "\n");

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1:/tmp/cvs-serv32402

Modified Files:
	ChangeLog config.h.in configure configure.in 
Log Message:
Add -v option for the sake of proposed KDE wrapper "kscope".

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -r1.124 -r1.125
*** ChangeLog	2 Jun 2003 10:42:59 -0000	1.124
--- ChangeLog	12 Jun 2003 17:11:35 -0000	1.125
***************
*** 1,2 ****
--- 1,4 ----
+ (2003/06/12 - broeker) New option -v to output progress updates even in
+ 		       line mode.  To be used by interface kscope.
  (2003/06/02 - broeker) Use the basename of files only to test for SCCS/RCS
  	               files in -R traversal.

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** config.h.in	23 Jan 2003 17:46:15 -0000	1.14
--- config.h.in	12 Jun 2003 17:11:37 -0000	1.15
***************
*** 29,32 ****
--- 29,36 ----
  #undef HAVE_LSTAT
  
+ /* Define to 1 if `lstat' has the bug that it succeeds when given the
+    zero-length file name argument. */
+ #undef HAVE_LSTAT_EMPTY_STRING_BUG
+ 
  /* Define to 1 if you have the `memcpy' function. */
  #undef HAVE_MEMCPY
***************
*** 99,102 ****
--- 103,110 ----
  /* Define to 1 if you have the `_setmode' function. */
  #undef HAVE__SETMODE
+ 
+ /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+    slash. */
+ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
  
  /* We're using some variant of Linux */

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** configure	23 Jan 2003 17:46:16 -0000	1.20
--- configure	12 Jun 2003 17:11:37 -0000	1.21
***************
*** 5278,5281 ****
--- 5278,5415 ----
  done
  
+ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
+ echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
+ if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   rm -f conftest.sym conftest.file
+ echo >conftest.file
+ if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_lstat_dereferences_slashed_symlink=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+ {
+ struct stat sbuf;
+      /* Linux will dereference the symlink and fail.
+         That is better in the sense that it means we will not
+         have to compile and use the lstat wrapper.  */
+      exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_lstat_dereferences_slashed_symlink=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_lstat_dereferences_slashed_symlink=no
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ else
+   # If the `ln -s' command failed, then we probably don't even
+   # have an lstat function.
+   ac_cv_func_lstat_dereferences_slashed_symlink=no
+ fi
+ rm -f conftest.sym conftest.file
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+ echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
+ 
+ test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+ _ACEOF
+ 
+ 
+ if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+   LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ fi
+ 
+ echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5
+ echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6
+ if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_lstat_empty_string_bug=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+ {
+ struct stat sbuf;
+   exit (lstat ("", &sbuf) ? 1 : 0);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_lstat_empty_string_bug=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_lstat_empty_string_bug=no
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5
+ echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6
+ if test $ac_cv_func_lstat_empty_string_bug = yes; then
+   LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LSTAT_EMPTY_STRING_BUG 1
+ _ACEOF
+ 
+ fi
+ 
  
  case "$host_os" in

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** configure.in	23 Jan 2003 17:46:19 -0000	1.27
--- configure.in	12 Jun 2003 17:11:37 -0000	1.28
***************
*** 391,394 ****
--- 391,395 ----
  AC_CHECK_FUNCS(getcwd regcmp regcomp strerror vsnprintf snprintf lstat)
  AC_CHECK_FUNCS(fixkeypad)
+ AC_FUNC_LSTAT
  
  case "$host_os" in

Update of /cvsroot/cscope/cscope/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv32402/doc

Modified Files:
	cscope.1 
Log Message:
Add -v option for the sake of proposed KDE wrapper "kscope".

Index: cscope.1
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/cscope.1,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** cscope.1	2 Jan 2002 17:25:48 -0000	1.16
--- cscope.1	12 Jun 2003 17:11:38 -0000	1.17
***************
*** 6,10 ****
  .ll +8
  .B cscope
! .RB [ " -bCcdehkLlqRTUuV " ]
  .RB [ -F symfile  ]
  .RB [ -f reffile  ]
--- 6,10 ----
  .ll +8
  .B cscope
! .RB [ " -bCcdehkLlqRTUuVv " ]
  .RB [ -F symfile  ]
  .RB [ -f reffile  ]
***************
*** 151,154 ****
--- 151,158 ----
  Unconditionally build the cross-reference file (assume that all
  files have changed).
+ .TP
+ .B -v
+ Be more verbose in line-oriented mode.  Output progress updates during
+ database building and searches.
  .TP
  .B -V

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25655/src

Modified Files:
	dir.c 
Log Message:
Let -R check only the basename for sourcefile name patterns

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** dir.c	29 Apr 2003 14:08:45 -0000	1.18
--- dir.c	2 Jun 2003 10:42:59 -0000	1.19
***************
*** 40,44 ****
  #include <sys/types.h>	/* needed by stat.h and dirent.h */
  #include <dirent.h>
- #include <stdlib.h>
  #include <sys/stat.h>	/* stat */
  #include "global.h"
--- 40,43 ----
***************
*** 504,508 ****
  						 entry->d_ino != 0
  #endif
! 						 && issrcfile(path)
  						 && infilelist(path) == NO) {
  					  addsrcfile(path);
--- 503,507 ----
  						 entry->d_ino != 0
  #endif
! 						 && issrcfile(mybasename(path))
  						 && infilelist(path) == NO) {
  					  addsrcfile(path);
***************
*** 526,530 ****
  	/* if there is a file suffix */
  	if ((s = strrchr(file, '.')) != NULL && *++s != '\0') {
! 		
  		/* if an SCCS or versioned file */
  		if (file[1] == '.' && file + 2 != s) { /* 1 character prefix */
--- 525,529 ----
  	/* if there is a file suffix */
  	if ((s = strrchr(file, '.')) != NULL && *++s != '\0') {
! 
  		/* if an SCCS or versioned file */
  		if (file[1] == '.' && file + 2 != s) { /* 1 character prefix */

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1:/tmp/cvs-serv25655

Modified Files:
	ChangeLog 
Log Message:
Let -R check only the basename for sourcefile name patterns

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** ChangeLog	29 Apr 2003 14:08:44 -0000	1.123
--- ChangeLog	2 Jun 2003 10:42:59 -0000	1.124
***************
*** 1,2 ****
--- 1,4 ----
+ (2003/06/02 - broeker) Use the basename of files only to test for SCCS/RCS
+ 	               files in -R traversal.
  (2003/04/29 - broeker) Check that a src file is a regular file before trying to
  	               scan it.  Change from S_IFDIR/S_IFREG bit tests to