[Cscope-cvs] CVS: cscope/src display.c,1.21,1.22 global.h,1.23,1.24 main.c,1.29,1.30

[Hans-Bernhard B. <br...@us...>]

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");