cscope-cvs Mailing List for cscope

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888/src

Modified Files:
	build.c global.h main.c vp.h 
Log Message:
Updates driven by previous changes today.

Index: build.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/build.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** build.c	8 Jan 2004 14:07:20 -0000	1.6
--- build.c	30 Apr 2004 15:31:42 -0000	1.7
***************
*** 321,325 ****
  		/* get the first file name in the old cross-reference */
  		blocknumber = -1;
! 		(void) readblock();	/* read the first cross-ref block */
  		(void) scanpast('\t');	/* skip the header */
  		oldfile = getoldfile();
--- 321,325 ----
  		/* get the first file name in the old cross-reference */
  		blocknumber = -1;
! 		(void) read_block();	/* read the first cross-ref block */
  		(void) scanpast('\t');	/* skip the header */
  		oldfile = getoldfile();
***************
*** 601,610 ****
  				dbputc(*cp++);
  			}
! 		} while (*++cp == '\0' && (cp = readblock()) != NULL);
  		dbputc('\t');	/* copy the tab */
  		
  		/* get the next character */
  		if (*(cp + 1) == '\0') {
! 			cp = readblock();
  		}
  		/* exit if at the end of this file's data */
--- 601,610 ----
  				dbputc(*cp++);
  			}
! 		} while (*++cp == '\0' && (cp = read_block()) != NULL);
  		dbputc('\t');	/* copy the tab */
  		
  		/* get the next character */
  		if (*(cp + 1) == '\0') {
! 			cp = read_block();
  		}
  		/* exit if at the end of this file's data */
***************
*** 644,653 ****
  				dbputc(*cp++);
  			}
! 		} while (*++cp == '\0' && (cp = readblock()) != NULL);
  		dbputc('\n');	/* copy the newline */
  		
  		/* get the next character */
  		if (*(cp + 1) == '\0') {
! 			cp = readblock();
  		}
  		/* exit if at the end of this file's data */
--- 644,653 ----
  				dbputc(*cp++);
  			}
! 		} while (*++cp == '\0' && (cp = read_block()) != NULL);
  		dbputc('\n');	/* copy the newline */
  		
  		/* get the next character */
  		if (*(cp + 1) == '\0') {
! 			cp = read_block();
  		}
  		/* exit if at the end of this file's data */

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** global.h	30 Apr 2004 12:09:14 -0000	1.30
--- global.h	30 Apr 2004 15:31:42 -0000	1.31
***************
*** 262,266 ****
  extern	int	curdispline;
  extern	char	newpat[];	/* new pattern */
! extern	char	pattern[];	/* symbol or text pattern */
  
  /* crossref.c global data */
--- 262,266 ----
  extern	int	curdispline;
  extern	char	newpat[];	/* new pattern */
! extern	char	Pattern[];	/* symbol or text pattern */
  
  /* crossref.c global data */
***************
*** 336,340 ****
  char	*lookup(char *ident);
  char	*pathcomponents(char *path, int components);
! char	*readblock(void);
  char	*scanpast(char c);
  
--- 336,340 ----
  char	*lookup(char *ident);
  char	*pathcomponents(char *path, int components);
! char	*read_block(void);
  char	*scanpast(char c);
  

Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** main.c	8 Jan 2004 14:07:20 -0000	1.32
--- main.c	30 Apr 2004 15:31:43 -0000	1.33
***************
*** 173,177 ****
  					/* NOTREACHED */
  				}
! 				(void) strcpy(pattern, s);
  				goto nextarg;
  			}
--- 173,177 ----
  					/* NOTREACHED */
  				}
! 				(void) strcpy(Pattern, s);
  				goto nextarg;
  			}
***************
*** 373,380 ****
  #if TERMINFO
  		(void) keypad(stdscr, TRUE);	/* enable the keypad */
! #ifdef HAVE_FIXKEYPAD
  		fixkeypad();	/* fix for getch() intermittently returning garbage */
! #endif
! #endif
  #if UNIXPC
  		standend();	/* turn off reverse video */
--- 373,380 ----
  #if TERMINFO
  		(void) keypad(stdscr, TRUE);	/* enable the keypad */
! # ifdef HAVE_FIXKEYPAD
  		fixkeypad();	/* fix for getch() intermittently returning garbage */
! # endif
! #endif /* TERMINFO */
  #if UNIXPC
  		standend();	/* turn off reverse video */
***************
*** 546,550 ****
  	   subprocess to emacs or samuel */
  	if (linemode == YES) {
! 		if (*pattern != '\0') {		/* do any optional search */
  			if (search() == YES) {
  				while ((c = getc(refsfound)) != EOF) {
--- 546,550 ----
  	   subprocess to emacs or samuel */
  	if (linemode == YES) {
! 		if (*Pattern != '\0') {		/* do any optional search */
  			if (search() == YES) {
  				while ((c = getc(refsfound)) != EOF) {
***************
*** 580,584 ****
  			case '9':	/* samuel only */
  				field = *buf - '0';
! 				(void) strcpy(pattern, buf + 1);
  				(void) search();
  				(void) printf("cscope: %d lines\n", totallines);
--- 580,584 ----
  			case '9':	/* samuel only */
  				field = *buf - '0';
! 				(void) strcpy(Pattern, buf + 1);
  				(void) search();
  				(void) printf("cscope: %d lines\n", totallines);
***************
*** 642,651 ****
  	}
  	/* do any optional search */
! 	if (*pattern != '\0') {
  		atfield();		/* move to the input field */
  		(void) command(ctrl('Y'));	/* search */
! 	}
! 	/* read any symbol reference lines file */
! 	else if (reflines != NULL) {
  		(void) readrefs(reflines);
  	}
--- 642,650 ----
  	}
  	/* do any optional search */
! 	if (*Pattern != '\0') {
  		atfield();		/* move to the input field */
  		(void) command(ctrl('Y'));	/* search */
! 	} else if (reflines != NULL) {
! 		/* read any symbol reference lines file */
  		(void) readrefs(reflines);
  	}

Index: vp.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** vp.h	15 Sep 2003 10:59:05 -0000	1.6
--- vp.h	30 Apr 2004 15:31:43 -0000	1.7
***************
*** 66,70 ****
  extern	int	vpndirs;	/* number of directories in view path */
  
! void	vpinit(char *currentdir);
  int	vpopen(char *path, int oflag);
  int	vpaccess(char *path, mode_t amode);
--- 66,70 ----
  extern	int	vpndirs;	/* number of directories in view path */
  
! void	vpinit(char *current_dir);
  int	vpopen(char *path, int oflag);
  int	vpaccess(char *path, mode_t amode);

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888

Modified Files:
	ChangeLog 
Log Message:
Updates driven by previous changes today.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** ChangeLog	30 Apr 2004 12:09:14 -0000	1.135
--- ChangeLog	30 Apr 2004 15:31:42 -0000	1.136
***************
*** 1,4 ****
--- 1,23 ----
  2004-04-30  Hans-Bernhard Broeker  <br...@ph...>
  
+ 	* src/vpinit.c (vpinit): Renamed argument currentdir to
+ 	current_dir to avoid name clash with same-named global.
+ 
+ 	* src/command.c (Pattern): Renamed from "pattern", to avoid
+ 	multitute of compiler warnings about shadowing by locally defined
+ 	variables of the same name.  Changed all usages of this variable,
+ 	too.
+ 	(command): Test for individual KEY_* macros instead of TERMINFO
+ 	whenever one of the KEY_* macros is referenced.  This should
+ 	reduce the TERMINFO mess a little.
+ 
+ 	* src/find.c (read_block): Renamed from "readblock", to avoid name
+ 	clash with QNX system function of that name.  Calls changed
+ 	accordingly, all over the place.
+ 
+ 	* src/display.c: Fix fall-back definition of sigjmp_buf.
+ 
+ 	* src/constants.h: Activate TERMINFO for FreeBSD.
+ 
  	* src/input.c (mygetline): New function.  Poor-man's readline
  	imitation.

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5701/src

Modified Files:
	vpinit.c 
Log Message:
Rename argument to avoid name clash with global variable.

Index: vpinit.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vpinit.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** vpinit.c	5 May 2000 17:51:45 -0000	1.5
--- vpinit.c	30 Apr 2004 15:30:51 -0000	1.6
***************
*** 53,57 ****
  
  void
! vpinit(char *currentdir)
  {
  	char	*suffix;	/* path from view path node */
--- 53,57 ----
  
  void
! vpinit(char *current_dir)
  {
  	char	*suffix;	/* path from view path node */
***************
*** 66,70 ****
  	
  	/* if an existing directory list is to be updated, free it */
! 	if (currentdir != NULL && vpndirs > 0) {
  #if !NOMALLOC
  		for (i = 0; i < vpndirs; ++i) {
--- 66,70 ----
  	
  	/* if an existing directory list is to be updated, free it */
! 	if (current_dir != NULL && vpndirs > 0) {
  #if !NOMALLOC
  		for (i = 0; i < vpndirs; ++i) {
***************
*** 82,98 ****
  	}
  	/* if not given, get the current directory name */
! 	if (currentdir == NULL && (currentdir = getcwd(buf, MAXPATH)) == NULL) {
  		(void) fprintf(stderr, "%s: cannot get current directory name\n", argv0);
  		return;
  	}
  	/* see if this directory is in the first view path node */
! 	for (i = 0; vpath[i] == currentdir[i] && vpath[i] != '\0'; ++i) {
  		;
  	}
  	if ((vpath[i] != ':' && vpath[i] != '\0') ||
! 	    (currentdir[i] != '/' && currentdir[i] != '\0')) {
  		return;
  	}
! 	suffix = &currentdir[i];
  #if !NOMALLOC
  
--- 82,98 ----
  	}
  	/* if not given, get the current directory name */
! 	if (current_dir == NULL && (current_dir = getcwd(buf, MAXPATH)) == NULL) {
  		(void) fprintf(stderr, "%s: cannot get current directory name\n", argv0);
  		return;
  	}
  	/* see if this directory is in the first view path node */
! 	for (i = 0; vpath[i] == current_dir[i] && vpath[i] != '\0'; ++i) {
  		;
  	}
  	if ((vpath[i] != ':' && vpath[i] != '\0') ||
! 	    (current_dir[i] != '/' && current_dir[i] != '\0')) {
  		return;
  	}
! 	suffix = &current_dir[i];
  #if !NOMALLOC
  

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5309/src

Modified Files:
	display.c 
Log Message:
Fix type in fallback definition of sigjmp_buf.

Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** display.c	12 Feb 2004 18:13:14 -0000	1.24
--- display.c	30 Apr 2004 15:29:04 -0000	1.25
***************
*** 58,62 ****
  # define sigsetjmp(a,b) setjmp(a)
  # define siglongjmp(a,b) longjmp(a,b)
! # typedef jmp_buf sigjmp_buf;
  #endif
  
--- 58,62 ----
  # define sigsetjmp(a,b) setjmp(a)
  # define siglongjmp(a,b) longjmp(a,b)
! typedef jmp_buf sigjmp_buf;
  #endif
  
***************
*** 176,183 ****
  		/* display the pattern */
  		if (changing == YES) {
! 			printw("Change \"%s\" to \"%s\"", pattern, newpat);
  		} else {
  			printw("%c%s: %s", toupper((unsigned char)fields[field].text2[0]),
! 				fields[field].text2 + 1, pattern);
  		}
  		/* display the column headings */
--- 176,183 ----
  		/* display the pattern */
  		if (changing == YES) {
! 			printw("Change \"%s\" to \"%s\"", Pattern, newpat);
  		} else {
  			printw("%c%s: %s", toupper((unsigned char)fields[field].text2[0]),
! 				fields[field].text2 + 1, Pattern);
  		}
  		/* display the column headings */
***************
*** 437,441 ****
  		f = fields[field].findfcn;
  		if (f == findregexp || f == findstring) {
! 			findresult = (*f)(pattern);
  		} else {
  			if ((nonglobalrefs = myfopen(temp2, "wb")) == NULL) {
--- 437,441 ----
  		f = fields[field].findfcn;
  		if (f == findregexp || f == findstring) {
! 			findresult = (*f)(Pattern);
  		} else {
  			if ((nonglobalrefs = myfopen(temp2, "wb")) == NULL) {
***************
*** 443,449 ****
  				return(NO);
  			}
! 			if ((rc = findinit(pattern)) == NOERROR) {
  				(void) dbseek(0L); /* read the first block */
! 				findresult = (*f)(pattern);
  				if (f == findcalledby) 
  					funcexist = (*findresult == 'y');
--- 443,449 ----
  				return(NO);
  			}
! 			if ((rc = findinit(Pattern)) == NOERROR) {
  				(void) dbseek(0L); /* read the first block */
! 				findresult = (*f)(Pattern);
  				if (f == findcalledby) 
  					funcexist = (*findresult == 'y');
***************
*** 483,500 ****
  		if (findresult != NULL) {
  			(void) sprintf(lastmsg, "Egrep %s in this pattern: %s", 
! 				       findresult, pattern);
  		} else if (rc == NOTSYMBOL) {
  			(void) sprintf(lastmsg, "This is not a C symbol: %s", 
! 				       pattern);
  		} else if (rc == REGCMPERROR) {
  			(void) sprintf(lastmsg, "Error in this regcomp(3) regular expression: %s", 
! 				       pattern);
  			
  		} else if (funcexist == NO) {
  			(void) sprintf(lastmsg, "Function definition does not exist: %s", 
! 				       pattern);
  		} else {
  			(void) sprintf(lastmsg, "Could not find the %s: %s", 
! 				       fields[field].text2, pattern);
  		}
  		return(NO);
--- 483,500 ----
  		if (findresult != NULL) {
  			(void) sprintf(lastmsg, "Egrep %s in this pattern: %s", 
! 				       findresult, Pattern);
  		} else if (rc == NOTSYMBOL) {
  			(void) sprintf(lastmsg, "This is not a C symbol: %s", 
! 				       Pattern);
  		} else if (rc == REGCMPERROR) {
  			(void) sprintf(lastmsg, "Error in this regcomp(3) regular expression: %s", 
! 				       Pattern);
  			
  		} else if (funcexist == NO) {
  			(void) sprintf(lastmsg, "Function definition does not exist: %s", 
! 				       Pattern);
  		} else {
  			(void) sprintf(lastmsg, "Could not find the %s: %s", 
! 				       fields[field].text2, Pattern);
  		}
  		return(NO);

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5128/src

Modified Files:
	constants.h 
Log Message:
Turn on TERMINFO for FreeBSD.

Index: constants.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/constants.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** constants.h	11 Jul 2002 14:23:45 -0000	1.12
--- constants.h	30 Apr 2004 15:28:25 -0000	1.13
***************
*** 55,64 ****
  /* note that blockp is assumed not to be null */
  #define	getrefchar()	(*(++blockp + 1) != '\0' ? *blockp : \
! 			(readblock() != NULL ? *blockp : '\0'))
  
  /* skip the next character in the cross-reference */
  /* note that blockp is assumed not to be null and that
     this macro will always be in a statement by itself */
! #define	skiprefchar()	if (*(++blockp + 1) == '\0') (void) readblock()
  
  #define	ESC	'\033'		/* escape character */
--- 55,64 ----
  /* note that blockp is assumed not to be null */
  #define	getrefchar()	(*(++blockp + 1) != '\0' ? *blockp : \
! 			(read_block() != NULL ? *blockp : '\0'))
  
  /* skip the next character in the cross-reference */
  /* note that blockp is assumed not to be null and that
     this macro will always be in a statement by itself */
! #define	skiprefchar()	if (*(++blockp + 1) == '\0') (void) read_block()
  
  #define	ESC	'\033'		/* escape character */
***************
*** 96,132 ****
  #define	FIELDS		9
  
! #if (BSD || V9) && !__NetBSD__
! #define TERMINFO	0	/* no terminfo curses */
  #else
! #define TERMINFO	1
  #endif
  
  
- #ifndef __FreeBSD__	/* Prevent search issues in cscope.out */
  #if !TERMINFO
! #ifndef KEY_BREAK
! #define	KEY_BREAK	0400	/* easier to define than to add #if around the use */
! #endif
! #ifndef KEY_ENTER
! #define	KEY_ENTER	0401
! #endif
! #ifndef KEY_BACKSPACE
! #define	KEY_BACKSPACE	0402
! #endif
! 
! #if !sun
! #define cbreak()	crmode()			/* name change */
! #endif
! 
! #if UNIXPC
! #define	erasechar()	(_tty.c_cc[VERASE])		/* equivalent */
! #define	killchar()	(_tty.c_cc[VKILL])		/* equivalent */
! #else
! #define	erasechar()	(_tty.sg_erase)			/* equivalent */
! #define	killchar()	(_tty.sg_kill)			/* equivalent */
! #endif	/* if UNIXPC */
! 
  #endif	/* if !TERMINFO */
- #endif	/* ifndef __FreeBSD__ */
  
  #endif /* CSCOPE_CONSTANTS_H */
--- 96,129 ----
  #define	FIELDS		9
  
! #if (BSD || V9) && !__NetBSD__ && !__FreeBSD__
! # define TERMINFO	0	/* no terminfo curses */
  #else
! # define TERMINFO	1
  #endif
  
  
  #if !TERMINFO
! # ifndef KEY_BREAK
! #  define	KEY_BREAK	0400	/* easier to define than to add #if around the use */
! # endif
! # ifndef KEY_ENTER
! #  define	KEY_ENTER	0401
! # endif
! # ifndef KEY_BACKSPACE
! #  define	KEY_BACKSPACE	0402
! # endif
! 
! # if !sun
! #  define cbreak()	crmode()			/* name change */
! # endif
! 
! # if UNIXPC
! #  define erasechar() (_tty.c_cc[VERASE])		/* equivalent */
! #  define killchar()  (_tty.c_cc[VKILL])		/* equivalent */
! # else
! #  define erasechar() (_tty.sg_erase)			/* equivalent */
! #  define killchar()  (_tty.sg_kill)			/* equivalent */
! # endif /* if UNIXPC */
  #endif	/* if !TERMINFO */
  
  #endif /* CSCOPE_CONSTANTS_H */

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4678

Modified Files:
	find.c 
Log Message:
Renamed readblock() to read_block, avoiding a name clash with the QNX
system libraries.


Index: find.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/find.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** find.c	8 Jan 2004 14:07:20 -0000	1.16
--- find.c	30 Apr 2004 15:26:17 -0000	1.17
***************
*** 126,134 ****
  				++cp;
  			}
! 		} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  
  		/* skip the found character */
  		if (cp != NULL && *(++cp + 1) == '\0') {
! 			cp = readblock();
  		}
  		if (cp == NULL) {
--- 126,134 ----
  				++cp;
  			}
! 		} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  
  		/* skip the found character */
  		if (cp != NULL && *(++cp + 1) == '\0') {
! 			cp = read_block();
  		}
  		if (cp == NULL) {
***************
*** 738,742 ****
  			++i;
  		}
! 	} while (*(blockp + 1) == '\0' && readblock() != NULL);
  	
  	if (*blockp == '\n' && cpattern[i] == '\0') {
--- 738,742 ----
  			++i;
  		}
! 	} while (*(blockp + 1) == '\0' && read_block() != NULL);
  	
  	if (*blockp == '\n' && cpattern[i] == '\0') {
***************
*** 853,857 ****
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  	blockp = cp;
  }
--- 853,857 ----
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  	blockp = cp;
  }
***************
*** 879,883 ****
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  	blockp = cp;
  	*s = '\0';
--- 879,883 ----
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  	blockp = cp;
  	*s = '\0';
***************
*** 885,889 ****
  /* scan past the next occurence of this character in the cross-reference */
  
! char	*
  scanpast(char c)
  {
--- 885,889 ----
  /* scan past the next occurence of this character in the cross-reference */
  
! char *
  scanpast(char c)
  {
***************
*** 896,900 ****
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  	blockp = cp;
  	if (cp != NULL) {
--- 896,900 ----
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  	blockp = cp;
  	if (cp != NULL) {
***************
*** 905,911 ****
  
  /* read a block of the cross-reference */
! 
! char	*
! readblock(void)
  {
  	/* read the next block */
--- 905,911 ----
  
  /* read a block of the cross-reference */
! /* HBB 20040430: renamed from readblock(), to avoid name clash on QNX */
! char *
! read_block(void)
  {
  	/* read the next block */
***************
*** 1149,1153 ****
  			return(rc);
  		}
! 		(void) readblock();
  		blocknumber = n;
  	}
--- 1149,1153 ----
  			return(rc);
  		}
! 		(void) read_block();
  		blocknumber = n;
  	}

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4086

Modified Files:
	command.c 
Log Message:
* Renamed global variable 'pattern' to 'Pattern' to reduce name clashes
  with local variables
* Check existence of KEY_* macros themselves when using them, not the
  blanket definition TERMINFO.


Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** command.c	30 Apr 2004 12:09:14 -0000	1.22
--- command.c	30 Apr 2004 15:24:18 -0000	1.23
***************
*** 56,60 ****
  BOOL	changing;		/* changing text */
  char	newpat[PATLEN + 1];	/* new pattern */
! char	pattern[PATLEN + 1];	/* symbol or text pattern */
  
  static	char	appendprompt[] = "Append to file: ";
--- 56,62 ----
  BOOL	changing;		/* changing text */
  char	newpat[PATLEN + 1];	/* new pattern */
! /* HBB 20040430: renamed to avoid lots of clashes with function arguments
!  * also named 'pattern' */
! char	Pattern[PATLEN + 1];	/* symbol or text pattern */
  
  static	char	appendprompt[] = "Append to file: ";
***************
*** 175,179 ****
  		return(NO);
  
! #if TERMINFO
  	case KEY_ENTER:
  #endif
--- 177,181 ----
  		return(NO);
  
! #ifdef KEY_ENTER
  	case KEY_ENTER:
  #endif
***************
*** 188,193 ****
  
  	case ctrl('N'):
! #if TERMINFO
  	case KEY_DOWN:
  	case KEY_RIGHT:
  #endif
--- 190,197 ----
  
  	case ctrl('N'):
! #ifdef KEY_DOWN
  	case KEY_DOWN:
+ #endif		
+ #ifdef KEY_RIGHT
  	case KEY_RIGHT:
  #endif
***************
*** 210,215 ****
  
  	case ctrl('P'):	/* go to previous input field */
! #if TERMINFO
  	case KEY_UP:
  	case KEY_LEFT:
  #endif
--- 214,221 ----
  
  	case ctrl('P'):	/* go to previous input field */
! #ifdef KEY_UP
  	case KEY_UP:
+ #endif
+ #ifdef KEY_LEFT		
  	case KEY_LEFT:
  #endif
***************
*** 230,234 ****
  		}
  		return(NO);
! #if TERMINFO
  	case KEY_HOME:	/* go to first input field */
  		if (selecting)
--- 236,240 ----
  		}
  		return(NO);
! #ifdef KEY_HOME
  	case KEY_HOME:	/* go to first input field */
  		if (selecting)
***************
*** 261,269 ****
  		}
  		return(NO);
! #endif
  	case ' ':	/* display next page */
  	case '+':
  	case ctrl('V'):
! #if TERMINFO
  	case KEY_NPAGE:
  #endif
--- 267,275 ----
  		}
  		return(NO);
! #endif /* def(KEY_HOME) */
  	case ' ':	/* display next page */
  	case '+':
  	case ctrl('V'):
! #ifdef KEY_NPAGE
  	case KEY_NPAGE:
  #endif
***************
*** 281,285 ****
  	case ctrl('H'):
  	case '-':	/* display previous page */
! #if TERMINFO
  	case KEY_PPAGE:
  #endif
--- 287,291 ----
  	case ctrl('H'):
  	case '-':	/* display previous page */
! #ifdef KEY_PPAGE
  	case KEY_PPAGE:
  #endif
***************
*** 407,411 ****
  
  	case ctrl('L'):	/* redraw screen */
! #if TERMINFO
  	case KEY_CLEAR:
  #endif
--- 413,417 ----
  
  	case ctrl('L'):	/* redraw screen */
! #ifdef KEY_CLEAR
  	case KEY_CLEAR:
  #endif
***************
*** 433,438 ****
  
  	case ctrl('Y'):	/* repeat last pattern */
! 		if (*pattern != '\0') {
! 			(void) addstr(pattern);
  			goto repeat;
  		}
--- 439,444 ----
  
  	case ctrl('Y'):	/* repeat last pattern */
! 		if (*Pattern != '\0') {
! 			(void) addstr(Pattern);
  			goto repeat;
  		}
***************
*** 455,459 ****
  			atfield();
  			(void) addstr(item->text);
! 			(void) strcpy(pattern, item->text);
  			switch (c = mygetch()) {
  			case '\r':
--- 461,465 ----
  			atfield();
  			(void) addstr(item->text);
! 			(void) strcpy(Pattern, item->text);
  			switch (c = mygetch()) {
  			case '\r':
***************
*** 468,473 ****
  			default:
  				(void) myungetch(c);
! 				if (mygetline(pattern, newpat, COLS - fldcolumn - 1, '\0', caseless )) {
! 					strcpy (pattern, newpat);
  					resetcmd();
  				}
--- 474,479 ----
  			default:
  				(void) myungetch(c);
! 				if (mygetline(Pattern, newpat, COLS - fldcolumn - 1, '\0', caseless )) {
! 					strcpy (Pattern, newpat);
  					resetcmd();
  				}
***************
*** 506,513 ****
  	ispat:		if (getline(newpat, COLS - fldcolumn - 1, commandc,
  			    caseless) > 0) {
! 					(void) strcpy(pattern, newpat);
  					resetcmd();	/* reset command history */
  	repeat:
! 				addcmd(field, pattern);	/* add to command history */
  				if (field == CHANGE) {
  					
--- 512,519 ----
  	ispat:		if (getline(newpat, COLS - fldcolumn - 1, commandc,
  			    caseless) > 0) {
! 					(void) strcpy(Pattern, newpat);
  					resetcmd();	/* reset command history */
  	repeat:
! 				addcmd(field, Pattern);	/* add to command history */
  				if (field == CHANGE) {
  					
***************
*** 628,632 ****
  		
  		/* get a character from the terminal */
! 		if ((c = mygetch()) == EOF || c == ctrl('D') || c == ctrl('Z')) {
  			break;	/* change lines */
  		}
--- 634,640 ----
  		
  		/* get a character from the terminal */
! 		if ((c = mygetch()) == EOF
! 		    || c == ctrl('D') 
! 		    || c == ctrl('Z')) {
  			break;	/* change lines */
  		}
***************
*** 636,644 ****
  		case '+':
  		case ctrl('V'):
! #if TERMINFO
  		case KEY_NPAGE:
  #endif
  		case '-':	/* display previous page */
! #if TERMINFO
  		case KEY_PPAGE:
  #endif
--- 644,652 ----
  		case '+':
  		case ctrl('V'):
! #ifdef KEY_NPAGE
  		case KEY_NPAGE:
  #endif
  		case '-':	/* display previous page */
! #ifdef KEY_PPAGE
  		case KEY_PPAGE:
  #endif
***************
*** 649,653 ****
  
  		case ctrl('L'):	/* redraw screen */
! #if TERMINFO
  		case KEY_CLEAR:
  #endif
--- 657,661 ----
  
  		case ctrl('L'):	/* redraw screen */
! #ifdef KEY_CLEAR
  		case KEY_CLEAR:
  #endif
***************
*** 743,747 ****
  			/* output substitute command */
  			(void) fprintf(script, "%ss/", linenum);	/* change */
! 			for (s = pattern; *s != '\0'; ++s) {	/* old text */
  				if (strchr("/\\[.^*", *s) != NULL) {
  					(void) putc('\\', script);
--- 751,756 ----
  			/* output substitute command */
  			(void) fprintf(script, "%ss/", linenum);	/* change */
! 			for (s = Pattern; *s != '\0'; ++s) {
! 				/* old text */
  				if (strchr("/\\[.^*", *s) != NULL) {
  					(void) putc('\\', script);

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23688

Modified Files:
	ChangeLog 
Log Message:
Make input fields editable after recalling them from history (Ctrl-B/F).

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** ChangeLog	24 Feb 2004 15:13:20 -0000	1.134
--- ChangeLog	30 Apr 2004 12:09:14 -0000	1.135
***************
*** 1,2 ****
--- 1,16 ----
+ 2004-04-30  Hans-Bernhard Broeker  <br...@ph...>
+ 
+ 	* src/input.c (mygetline): New function.  Poor-man's readline
+ 	imitation.
+ 
+ 	* src/global.h (mygetline): Prototype added.
+ 
+ 	* src/command.c (command): Use mygetline() instead of letting
+ 	ncsurses doing it all.  Make Ctrl-B/F special hotkeys that are
+ 	handled here instead of in mygetline(), to preserve their meaning.
+ 
+ 	* packages/cscope.spec: Updated by SF patch #920586 to be more
+ 	compatible with current expectations.
+ 
  2004-02-24  Hans-Bernhard Broeker  <br...@ph...>
  

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23688/src

Modified Files:
	command.c input.c global.h 
Log Message:
Make input fields editable after recalling them from history (Ctrl-B/F).

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** command.c	14 Feb 2004 18:25:15 -0000	1.21
--- command.c	30 Apr 2004 12:09:14 -0000	1.22
***************
*** 460,468 ****
  			case '\n':
  				goto repeat;
! 			default:
  				(void) myungetch(c);
  				atfield();
  				(void) clrtoeol();	/* clear current field */
  				break;
  			}
  		}
--- 460,477 ----
  			case '\n':
  				goto repeat;
! 			case ctrl('F'):
! 			case ctrl('B'):
  				(void) myungetch(c);
  				atfield();
  				(void) clrtoeol();	/* clear current field */
  				break;
+ 			default:
+ 				(void) myungetch(c);
+ 				if (mygetline(pattern, newpat, COLS - fldcolumn - 1, '\0', caseless )) {
+ 					strcpy (pattern, newpat);
+ 					resetcmd();
+ 				}
+ 				goto repeat;
+ 				break;
  			}
  		}

Index: input.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/input.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** input.c	12 Feb 2004 18:14:05 -0000	1.10
--- input.c	30 Apr 2004 12:09:14 -0000	1.11
***************
*** 54,58 ****
  
  /* Internal prototypes: */
! static	RETSIGTYPE	catchint(int sig);
  
  /* catch the interrupt signal */
--- 54,58 ----
  
  /* Internal prototypes: */
! static RETSIGTYPE catchint(int sig);
  
  /* catch the interrupt signal */
***************
*** 68,72 ****
  
  /* unget a character */
- 
  void
  myungetch(int c)
--- 68,71 ----
***************
*** 76,80 ****
  
  /* get a character from the terminal */
- 
  int
  mygetch(void)
--- 75,78 ----
***************
*** 103,106 ****
--- 101,236 ----
  
  int
+ mygetline(char p[], char s[], unsigned size, int firstchar, BOOL iscaseless)
+ {
+ 	int	c, i = 0;
+ 	int	j;
+ 	char *sright;	/* substring to the right of the cursor */
+ 	int ri = 0;		/* position in right-string */
+ 
+ 	/* Inserts and deletes are always performed on the left-string,
+ 	 * but we'll also have a right-string 'sright' to hold characters
+ 	 * which are on the right of the cursor [insertion point].
+ 	 *
+ 	 * Think of 'sright' as a stack -- we push chars into it when the cursor
+ 	 * moves left, and we pop chars off it when the cursor moves right again.
+ 	 * At the end of the function, we'll pop off any remaining characters
+ 	 * onto the end of 's'
+ 	 */
+ 	sright = calloc(sizeof(char), size );
+ 
+ 	strcpy ( s, p);
+ 	i += strlen(p);
+ 	/* if a character already has been typed */
+ 	if (firstchar != '\0') {
+ 		if(iscaseless == YES) {
+ 			firstchar = tolower(firstchar);
+ 		}
+ 		addch(firstchar);	/* display it */
+ 		s[i++] = firstchar;	/* save it */
+ 	}
+ 	/* until the end of the line is reached */
+ 	while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) {
+ 		if (c == KEY_LEFT || c == ctrl('B')) {	/* left */
+ 			if (i > 0) {
+ 				addch('\b');
+ 				/* move this char into the second (rhs) string */
+ 				sright[ri++] = s[--i];
+ 			}
+ 		} else if (c == KEY_RIGHT || c == ctrl('F')) {	/* right */
+ 			if (i < size && ri > 0) {
+ 				/* move this char to the left of the cursor */
+ 				s[i++] = sright[--ri];
+ 				addch(s[i-1]);
+ 			}
+ 		} else if (
+ 		#ifdef KEY_HOME
+ 			c == KEY_HOME ||
+ 		#endif
+ 			c == ctrl('A') ) {
+ 			while (i > 0) {
+ 				sright[ri++] = s[--i];
+ 				addch('\b');
+ 				addch(s[i]);
+ 				addch('\b');
+ 			}
+ 		} else if (
+ 		#ifdef KEY_END
+ 			c == KEY_END ||
+ 		#endif
+ 			c == ctrl('E') ) {
+ 			while (ri > 0) {
+ 				s[i++] = sright[--ri];
+ 				addch(s[i-1]);
+ 			}
+ 		} else if (c == erasechar() || c == KEY_BACKSPACE
+ 			   || c == DEL || c == ctrl('H') ) {
+ 			/* erase */
+ 			if (i > 0) {
+ 				if (ri == 0)  {
+ 					addstr("\b \b");
+ 				} else {
+ 					addch('\b');
+ 					delch();
+ 				}
+ 				s[i] = '\0';
+ 				--i;
+ 			}
+ 		} else if (c == killchar() || c == KEY_BREAK) {
+ 			/* kill */
+ 			for (j = 0; j < i; ++j) {
+ 				addch('\b');
+ 			}
+ 			for (j = 0; j < i; ++j) {
+ 				addch(' ');
+ 			}
+ 			for (j = 0; j < i; ++j) {
+ 				addch('\b');
+ 			}
+ 			i = 0;
+ 		} else if (isprint(c) || c == '\t') {
+ 			/* printable */
+ 			if(iscaseless == YES) {
+ 				c = tolower(c);
+ 			}
+ 			/* if it will fit on the line */
+ 			if (i < size) {
+ 				s[i++] = c;	/* save it */
+ 				if (ri == 0) {
+ 					addch(c);	/* display it */
+ 				} else {
+ 					insch(c);	/* display it */
+ 					addch(c);	/* advance cursor */
+ 				}
+ 			}
+ #if UNIXPC
+ 		} else if (unixpcmouse == YES && c == ESC) {	/* mouse */
+ 			getmouseaction(ESC);	/* ignore it */
+ #endif
+ 		} else if (mouse == YES && c == ctrl('X')) {
+ 			getmouseaction(ctrl('X'));	/* ignore it */
+ 		} else if (c == EOF) {				/* end-of-file */
+ 			break;
+ 		}
+ 
+ 		/* return on an empty line to allow a command to be entered */
+ 		if (firstchar != '\0' && (i+ri) == 0) {
+ 			break;
+ 		}
+ 	}
+ 
+ 	/* move any remaining chars on the rhs of the cursor
+ 	 * onto the end of our string
+ 	 */
+ 	while (ri > 0) {
+ 		s[i++] = sright[--ri];
+ 	}
+ 	free(sright);
+ 
+ 	s[i] = '\0';
+ 	return(i);
+ }
+ /* get a line from the terminal in non-canonical mode */
+ 
+ int
  getline(char s[], unsigned size, int firstchar, BOOL iscaseless)
  {

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** global.h	24 Feb 2004 15:13:21 -0000	1.29
--- global.h	30 Apr 2004 12:09:14 -0000	1.30
***************
*** 407,410 ****
--- 407,411 ----
  int	egrep(char *file, FILE *output, char *format);
  int	getline(char s[], unsigned size, int firstchar, BOOL iscaseless);
+ int	mygetline(char p[], char s[], unsigned size, int firstchar, BOOL iscaseless);
  int	mygetch(void);
  int	hash(char *ss);

Update of /cvsroot/cscope/cscope/packages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23380/packages

Modified Files:
	cscope.spec 
Log Message:
Updated RPM spec to current standards.

Index: cscope.spec
===================================================================
RCS file: /cvsroot/cscope/cscope/packages/cscope.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** cscope.spec	3 Jul 2001 22:09:50 -0000	1.10
--- cscope.spec	30 Apr 2004 12:07:45 -0000	1.11
***************
*** 3,10 ****
  Version: 16.0a
  Release: 1
! Copyright: BSD
  Group: Development/Tools
  Source: cscope-16.0a.tar.gz
! Buildroot: /tmp/%{name}-%{version}
  
  %description
--- 3,12 ----
  Version: 16.0a
  Release: 1
! Epoch: 1
! License: BSD
  Group: Development/Tools
  Source: cscope-16.0a.tar.gz
! URL: http://cscope.sourceforge.net
! Buildroot: %{_tmppath}/%{name}-root
  
  %description
***************
*** 12,41 ****
  
  %prep
! %setup
  
  %build
! ./configure
  make
  
  %install
! rm -rf $RPM_BUILD_ROOT
! mkdir -p $RPM_BUILD_ROOT/usr/bin
! mkdir -p $RPM_BUILD_ROOT/usr/man/man1
! 
! install -s -m 755 src/cscope $RPM_BUILD_ROOT/usr/bin/cscope
! install -m 755 doc/cscope.1 $RPM_BUILD_ROOT/usr/man/man1/cscope.1
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %files
  %defattr(-,root,root)
  %doc TODO COPYING ChangeLog AUTHORS README NEWS INSTALL
! 
! /usr/bin/cscope
! /usr/man/man1/cscope.1
  
  %changelog
! * Mon Jul 2 2001 Cscope development team
  - Version 15.3 release
  - New flex scanner
--- 14,41 ----
  
  %prep
! %setup -q
  
  %build
! %configure
  make
  
  %install
! rm -rf %{buildroot}
! %makeinstall
  
  %clean
! rm -rf %{buildroot}
  
  %files
  %defattr(-,root,root)
  %doc TODO COPYING ChangeLog AUTHORS README NEWS INSTALL
! %{_bindir}/*
! %{_mandir}/man1/*
  
  %changelog
! * Sun Mar 21 2004 Adam Monsen <ad...@wa...>
! - updated packages/cscope.spec to use more RPM macros and shell globs.
!   Should be more generic/robust/up-to-date/etc.
! * Mon Jul 2 2001 Cscope development team <csc...@li...>
  - Version 15.3 release
  - New flex scanner
***************
*** 46,50 ****
  - More editing keys
  - Webcscope added to contrib
! * Wed Nov 20 2000 Cscope development team
  - Version 15.1 release
  - New menu and line matching interface
--- 46,50 ----
  - More editing keys
  - Webcscope added to contrib
! * Wed Nov 20 2000 Cscope development team <csc...@li...>
  - Version 15.1 release
  - New menu and line matching interface
***************
*** 52,56 ****
  - Numerous fixes
  - Updated documentation
! * Tue May 15 2000 Cscope development team
  - Version 15.0bl2 (build 2) pre-alpha release
  - Fixes and enhancements
--- 52,56 ----
  - Numerous fixes
  - Updated documentation
! * Tue May 15 2000 Cscope development team  <csc...@li...>
  - Version 15.0bl2 (build 2) pre-alpha release
  - Fixes and enhancements