cscope-cvs Mailing List for cscope

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

Modified Files:
	ChangeLog 
Log Message:
Updated after lots of changes.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -r1.155 -r1.156
*** ChangeLog	19 Apr 2006 14:30:16 -0000	1.155
--- ChangeLog	21 Apr 2006 10:47:59 -0000	1.156
***************
*** 1,4 ****
--- 1,84 ----
+ 2006-04-21  Hans-Bernhard Broeker  <br...@ph...>
+ 
+ 	Make source clean under -Wsign-compare.
+ 	
+ 	* src/main.c (fileargc): Make counter unsigned.
+ 	(main): Make local counter unsigned.
+ 	(main): Fixed two sprintf() excess arguments.
+ 
+ 	* src/lookup.c (initsymtab): Make local counters unsigned.
+ 
+ 	* src/invlib.c (LINEMAX): Removed.
+ 	(invmake): Change length of local variable "line" to TERMMAX.
+ 	(numpost, numlogblk, amtused, nextpost, lastinblk, numinvitems):
+ 	Make counters unsigned.
+ 	(invnewterm): Make local counters unsigned.
+ 
+ 	* src/input.c (mygetline): Make local counters unsigned.
+ 
+ 	* src/find.c (findregexp, findfile): Make local counters unsigned.
+ 
+ 	* src/egrep.y (line, left, right, parent): Make unsigned.
+ 	(enter, cclenter): Return unsigned.
+ 	(follow): Make argument unsigned.
+ 	(cclenter, cfoll, cgotofn, member, add, follow): Make local
+ 	counters unsigned.
+ 	(cgotofn, member): Cast char to unsigned char, not unsigned int,
+ 	for use as an index.
+ 
+ 	* src/display.c (disprefs, mdisprefs, nextline, topline,
+ 	totallines): Make unsigned.
+ 	(search): Removed unused locals.
+ 	(seekline): Make argument unsigned.
+ 
+ 	* src/dir.c (nincdirs, nsrcdirs, nsrcfiles, msrcfiles, mincdirs,
+ 	msrcdirs, nvpsrcdirs): Make unsigned long.
+ 	(sourcedir, includedir, makefilelist, incfile, inviewpath): Make
+ 	local counters unsigned.
+ 
+ 	* src/crossref.c (symbols, msymbols): Make unsigned long.
+ 	(struct symbol): Make elements first, last, length and fcn_level
+ 	unsigned.
+ 	(crossref, putcrossref): Make local counters unsigned.
+ 
+ 	* src/command.c (curdispline): Make unsigned.
+ 	(mark): Make argument and local counter unsigned.
+ 	(command): Make KEY_LL conditional on KEY_LL, not KEY_HOME.
+ 	(changestring): Made local counter unsigned.
+ 
+ 	* src/build.c (build): Change several local ints to unsigned
+ 	longs.
+ 
+ 	* src/global.h: Updated lots of declarations to match the above.
+ 
+ 	* src/alloc.c (mymalloc, mycalloc, myrealloc): Make size arguments
+ 	size_t. Remove pointless casts in several of their callers.
+ 
+ 	* src/library.h (mymalloc, mycalloc, myrealloc): Updated
+ 	prototoypes.
+ 
+ 2006-04-20  Hans-Bernhard Broeker  <br...@ph...>
+ 
+ 	* src/input.c (askforreturn): If curses is handling the display,
+ 	redraw the screen before returning, to keep error messages from
+ 	permanently scrambling the display.
+ 
+ 	* configure.in: Add test for <io.h>.
+ 
+ 	* configure, config.h.in: Regenerated.
+ 	
+ 	* src/mypopen.c [HAVE_IO_H]: #include <io.h> it, for the setmode()
+ 	declaration.
+ 
  2006-04-19  Hans-Bernhard Broeker  <br...@ph...>
  
+ 	General change: indentation width of touched areas changed to 4
+ 	spaces, open braces not on lines of their own, single-line "else
+ 	if", get rid of (void) casts of unused function return values.
+ 
+ 	* src/global.h (select_large): Removed declaration.
+ 
+ 	* src/main.c (select_large, main): Removed long unused global.
+ 
  	* src/dir.c (scan_dir): Get rid of d_ino check --- this field is
  	not reliably present in struct dirent, and doesn't achieve enough

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

Modified Files:
	alloc.c build.c command.c crossref.c dir.c display.c egrep.y 
	exec.c find.c global.h library.h lookup.c main.c 
Log Message:
Overall signed/unsigned cleanup.  
Re-formatting to 4-space indentation and no dangling open braces.

Index: alloc.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** alloc.c	8 Jan 2004 14:07:20 -0000	1.6
--- alloc.c	21 Apr 2006 10:45:48 -0000	1.7
***************
*** 45,52 ****
   * succeed more reliably than the defined(__STDC__) one I replaced */
  #if STDC_HEADERS
! #include <stdlib.h>
! # else
  char	*calloc(), *malloc(), *realloc(), *strcpy();
! # endif
  
  /* allocate a string */
--- 45,52 ----
   * succeed more reliably than the defined(__STDC__) one I replaced */
  #if STDC_HEADERS
! # include <stdlib.h>
! #else
  char	*calloc(), *malloc(), *realloc(), *strcpy();
! #endif
  
  /* allocate a string */
***************
*** 58,94 ****
  }
  
- /* version of malloc that only returns if successful */
  
  void *
! mymalloc(int size)
  {
! 	return(alloctest(malloc((unsigned) size)));
  }
  
- /* version of calloc that only returns if successful */
  
  void *
! mycalloc(int nelem, int size)
  {
! 	return(alloctest(calloc((unsigned) nelem, (unsigned) size)));
  }
  
- /* version of realloc that only returns if successful */
  
  void *
! myrealloc(void *p, int size)
  {
! 	return(alloctest(realloc(p, (unsigned) size)));
  }
  
- /* check for memory allocation failure */
  
  static	void *
  alloctest(void *p)
  {
! 	if (p == NULL) {
! 		postfatal("\n%s: out of storage\n", argv0);
! 		/* NOTREACHED */
! 	}
! 	return(p);
  }
--- 58,94 ----
  }
  
  
+ /* version of malloc that only returns if successful */
  void *
! mymalloc(size_t size)
  {
!     return(alloctest(malloc((unsigned) size)));
  }
  
  
+ /* version of calloc that only returns if successful */
  void *
! mycalloc(size_t nelem, size_t size)
  {
!     return(alloctest(calloc((unsigned) nelem, (unsigned) size)));
  }
  
  
+ /* version of realloc that only returns if successful */
  void *
! myrealloc(void *p, size_t size)
  {
!     return(alloctest(realloc(p, (unsigned) size)));
  }
  
  
+ /* check for memory allocation failure */
  static	void *
  alloctest(void *p)
  {
!     if (p == NULL) {
! 	postfatal("\n%s: out of storage\n", argv0);
! 	/* NOTREACHED */
!     }
!     return(p);
  }

Index: build.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/build.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** build.c	8 Jul 2005 11:16:29 -0000	1.9
--- build.c	21 Apr 2006 10:45:48 -0000	1.10
***************
*** 73,84 ****
  INVCONTROL invcontrol;		/* inverted file control structure */
  
- /* Local variables: */
  
  static char *newinvname;	/* new inverted index file name */
  static char *newinvpost;	/* new inverted index postings file name */
  static long traileroffset;	/* file trailer offset */
  
- /* Internal prototypes: */
  
[...1238 lines suppressed...]
!     unlink(old);
!     if (rename(new, old) == -1) {
! 	myperror("cscope");
! 	postfatal("cscope: cannot rename file %s to file %s\n",
! 		  new, old);
! 	/* NOTREACHED */
!     }
  }
  
  
+ /* process the #included file in the old database */
  static void
  putinclude(char *s)
  {
!     dbputc(INCLUDE);
!     skiprefchar();
!     putstring(s);
!     incfile(s + 1, s);
  }
  

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** command.c	8 Jul 2005 11:00:20 -0000	1.29
--- command.c	21 Apr 2006 10:45:48 -0000	1.30
***************
*** 50,54 ****
  
  int	selecting;
! int   curdispline = 0;
  
  BOOL	caseless;		/* ignore letter case when searching */
--- 50,54 ----
  
  int	selecting;
! unsigned int   curdispline = 0;
  
[...1704 lines suppressed...]
+ 
+     /* restrict the width of displayed columns */
+     /* HBB FIXME 20060419: magic number alert! */ 
+     i = (COLS - 5) / 3;
+     if (ogs == YES) {
+ 	i = (COLS - 7) / 5;
+     }
+     if (filelen > i && i > 4) {
+ 	filelen = i;
+     }
+     if (subsystemlen > i && i > 9) {
+ 	subsystemlen = i;
+     }
+     if (booklen > i && i > 4) {
+ 	booklen = i;
+     }
+     if (fcnlen > i && i > 8) {
+ 	fcnlen = i;
+     }
  }

Index: crossref.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/crossref.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** crossref.c	29 Apr 2003 14:08:45 -0000	1.12
--- crossref.c	21 Apr 2006 10:45:48 -0000	1.13
***************
*** 69,84 ****
  int	nsrcoffset;             /* number of file name database offsets */
  long	*srcoffset;             /* source file name database offsets */
! int	symbols;		/* number of symbols */
  
  static	char	*filename;	/* file name for warning messages */
  static	long	fcnoffset;	/* function name database offset */
  static	long	macrooffset;	/* macro name database offset */
! static	int	msymbols = SYMBOLINC;	/* maximum number of symbols */
  struct	symbol {	/* symbol data */
! 	int	type;		/* type */
! 	int	first;		/* index of first character in text */
! 	int	last;		/* index of last+1 character in text */
! 	int	length;		/* symbol length */
! 	int	fcn_level;	/* function level of the symbol */
  };
  static struct symbol *symbol;
--- 69,85 ----
  int	nsrcoffset;             /* number of file name database offsets */
  long	*srcoffset;             /* source file name database offsets */
! unsigned long symbols;		/* number of symbols */
  
  static	char	*filename;	/* file name for warning messages */
  static	long	fcnoffset;	/* function name database offset */
  static	long	macrooffset;	/* macro name database offset */
! static	unsigned long msymbols = SYMBOLINC; /* maximum number of symbols */
! 
  struct	symbol {	/* symbol data */
!     int	type;		/* type */
!     unsigned int first;		/* index of first character in text */
!     unsigned int last;		/* index of last+1 character in text */
!     unsigned int length;	/* symbol length */
!     unsigned int fcn_level;	/* function level of the symbol */
  };
  static struct symbol *symbol;
***************
*** 90,191 ****
  crossref(char *srcfile)
  {
! 	int	i;
! 	int	length;		/* symbol length */
! 	int	entry_no;		/* function level of the symbol */
! 	int	token;			/* current token */
! 	struct stat st;
! 
! 	if (! ((stat(srcfile, &st) == 0)
! 	       && S_ISREG(st.st_mode))) {
! 		cannotopen(srcfile);
! 		errorsfound = YES;
! 		return;
! 	}
  	
! 	entry_no = 0;
! 	/* open the source file */
! 	if ((yyin = myfopen(srcfile, "r")) == NULL) {
! 		cannotopen(srcfile);
! 		errorsfound = YES;
! 		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);
! 	fcnoffset = macrooffset = 0;
! 	symbols = 0;
! 	if (symbol == NULL) {
! 		symbol = mymalloc(msymbols * sizeof(struct symbol));
! 	}
! 	for (;;) {
  		
! 		/* get the next token */
! 		switch (token = yylex()) {
! 		default:
! 			/* if requested, truncate C symbols */
! 			length = last - first;
! 			if (trun_syms == YES && length > 8 &&
! 			    token != INCLUDE && token != NEWFILE) {
! 				length = 8;
! 				last = first + 8;
! 			}
! 			/* see if the token has a symbol */
! 			if (length == 0) {
! 				savesymbol(token, entry_no);
! 				break;
! 			}
! 			/* update entry_no if see function entry */
! 			if (token == FCNDEF) {
! 				entry_no++;
! 			}
! 			/* see if the symbol is already in the list */
! 			for (i = 0; i < symbols; ++i) {
! 				if (length == symbol[i].length
! 				    && strncmp(my_yytext + first,
! 					       my_yytext + symbol[i].first,
! 					       length) == 0 
! 				    && entry_no == symbol[i].fcn_level
! 				    && token == symbol[i].type
! 				    ) {	/* could be a::a() */
! 					break;
! 				}
! 			}
! 			if (i == symbols) {	/* if not already in list */
! 				savesymbol(token, entry_no);
! 			}
! 			break;
  
! 		case NEWLINE:	/* end of line containing symbols */
! 			entry_no = 0;	/* reset entry_no for each line */
  #ifdef USING_LEX
! 			--yyleng; 	/* remove the newline */
  #endif
! 			putcrossref();	/* output the symbols and source line */
! 			lineno = myylineno;	/* save the symbol line number */
  #ifndef USING_LEX
! 			/* HBB 20010425: replaced yyleng-- by this chunk: */
! 			if (my_yytext)
! 				*my_yytext = '\0';
! 			my_yyleng = 0;
  #endif
! 			break;
  			
! 		case LEXEOF:	/* end of file; last line may not have \n */
  			
  			/* if there were symbols, output them and the source line */
! 			if (symbols > 0) {
! 				putcrossref();
! 			}
! 			(void) fclose(yyin);	/* close the source file */
! 
! 			/* output the leading tab expected by the next call */
! 			dbputc('\t');
! 			return;
! 		}
  	}
  }
  
--- 91,192 ----
  crossref(char *srcfile)
  {
!     unsigned int i;
!     unsigned int length;	/* symbol length */
!     unsigned int entry_no;	/* function level of the symbol */
!     int token;                  /* current token */
!     struct stat st;
! 
!     if (! ((stat(srcfile, &st) == 0)
! 	   && S_ISREG(st.st_mode))) {
! 	cannotopen(srcfile);
! 	errorsfound = YES;
! 	return;
!     }
  	
!     entry_no = 0;
!     /* open the source file */
!     if ((yyin = myfopen(srcfile, "r")) == NULL) {
! 	cannotopen(srcfile);
! 	errorsfound = YES;
! 	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);
!     fcnoffset = macrooffset = 0;
!     symbols = 0;
!     if (symbol == NULL) {
! 	symbol = mymalloc(msymbols * sizeof(struct symbol));
!     }
!     for (;;) {
  		
! 	/* get the next token */
! 	switch (token = yylex()) {
! 	default:
! 	    /* if requested, truncate C symbols */
! 	    length = last - first;
! 	    if (trun_syms == YES && length > 8 &&
! 		token != INCLUDE && token != NEWFILE) {
! 		length = 8;
! 		last = first + 8;
! 	    }
! 	    /* see if the token has a symbol */
! 	    if (length == 0) {
! 		savesymbol(token, entry_no);
! 		break;
! 	    }
! 	    /* update entry_no if see function entry */
! 	    if (token == FCNDEF) {
! 		entry_no++;
! 	    }
! 	    /* see if the symbol is already in the list */
! 	    for (i = 0; i < symbols; ++i) {
! 		if (length == symbol[i].length
! 		    && strncmp(my_yytext + first,
! 			       my_yytext + symbol[i].first,
! 			       length) == 0 
! 		    && entry_no == symbol[i].fcn_level
! 		    && token == symbol[i].type
! 		    ) {	/* could be a::a() */
! 		    break;
! 		}
! 	    }
! 	    if (i == symbols) {	/* if not already in list */
! 		savesymbol(token, entry_no);
! 	    }
! 	    break;
  
! 	case NEWLINE:	/* end of line containing symbols */
! 	    entry_no = 0;	/* reset entry_no for each line */
  #ifdef USING_LEX
! 	    --yyleng; 	/* remove the newline */
  #endif
! 	    putcrossref();	/* output the symbols and source line */
! 	    lineno = myylineno;	/* save the symbol line number */
  #ifndef USING_LEX
! 	    /* HBB 20010425: replaced yyleng-- by this chunk: */
! 	    if (my_yytext)
! 		*my_yytext = '\0';
! 	    my_yyleng = 0;
  #endif
! 	    break;
  			
! 	case LEXEOF:	/* end of file; last line may not have \n */
  			
  			/* if there were symbols, output them and the source line */
! 	    if (symbols > 0) {
! 		putcrossref();
! 	    }
! 	    (void) fclose(yyin);	/* close the source file */
! 
! 	    /* output the leading tab expected by the next call */
! 	    dbputc('\t');
! 	    return;
  	}
+     }
  }
  
***************
*** 195,211 ****
  savesymbol(int token, int num)
  {
! 	/* make sure there is room for the symbol */
! 	if (symbols == msymbols) {
! 		msymbols += SYMBOLINC;
! 		symbol = myrealloc(symbol,
! 		    msymbols * sizeof(struct symbol));
! 	}
! 	/* save the symbol */
! 	symbol[symbols].type = token;
! 	symbol[symbols].first = first;
! 	symbol[symbols].last = last;
! 	symbol[symbols].length = last - first;
! 	symbol[symbols].fcn_level = num;
! 	++symbols;
  }
  
--- 196,211 ----
  savesymbol(int token, int num)
  {
!     /* make sure there is room for the symbol */
!     if (symbols == msymbols) {
! 	msymbols += SYMBOLINC;
! 	symbol = myrealloc(symbol, msymbols * sizeof(struct symbol));
!     }
!     /* save the symbol */
!     symbol[symbols].type = token;
!     symbol[symbols].first = first;
!     symbol[symbols].last = last;
!     symbol[symbols].length = last - first;
!     symbol[symbols].fcn_level = num;
!     ++symbols;
  }
  
***************
*** 234,377 ****
  putcrossref(void)
  {
! 	int	i, j;
! 	unsigned char c;
! 	BOOL	blank;		/* blank indicator */
! 	int	symput = 0;	/* symbols output */
! 	int	type;
! 
! 	/* output the source line */
! 	lineoffset = dboffset;
! 	dboffset += fprintf(newrefs, "%d ", lineno);
  #ifdef PRINTF_RETVAL_BROKEN
! 	dboffset = ftell(newrefs); /* fprintf doesn't return chars written */
  #endif
  
! 	/* HBB 20010425: added this line: */
! 	my_yytext[my_yyleng] = '\0';
  
! 	blank = NO;
! 	for (i = 0; i < my_yyleng; ++i) {
  		
! 		/* change a tab to a blank and compress blanks */
! 		if ((c = my_yytext[i]) == ' ' || c == '\t') {
! 			blank = YES;
! 		}
! 		/* look for the start of a symbol */
! 		else if (symput < symbols && i == symbol[symput].first) {
! 
! 			/* check for compressed blanks */
! 			if (blank == YES) {
! 				blank = NO;
! 				dbputc(' ');
! 			}
! 			dbputc('\n');	/* symbols start on a new line */
  			
! 			/* output any symbol type */
! 			if ((type = symbol[symput].type) != IDENT) {
! 				dbputc('\t');
! 				dbputc(type);
! 			}
! 			else {
! 				type = ' ';
! 			}
! 			/* output the symbol */
! 			j = symbol[symput].last;
! 			c = my_yytext[j];
! 			my_yytext[j] = '\0';
! 			if (invertedindex == YES) {
! 				putposting(my_yytext + i, type);
! 			}
! 			writestring(my_yytext + i);
! 			dbputc('\n');
! 			my_yytext[j] = c;
! 			i = j - 1;
! 			++symput;
  		}
! 		else {
!                        /* HBB: try to save some time by early-out handling of 
!                         * non-compressed mode */
! 			if (compress == NO) {
! 				if (blank == YES) {
! 					dbputc(' ');
! 					blank = NO;
! 				}
! 				j = i + strcspn(my_yytext+i, "\t ");
! 				if (symput < symbols
! 				    && j >= symbol[symput].first)
! 					j = symbol[symput].first;
! 				c = my_yytext[j];
! 				my_yytext[j] = '\0';
! 				writestring(my_yytext + i);
! 				my_yytext[j] = c;
! 				i = j - 1;
! 				/* finished this 'i', continue with the blank */
! 				continue;
! 			}
! 
! 			/* check for compressed blanks */
! 			if (blank == YES) {
! 				if (dicode2[c]) {
! 					c = DICODE_COMPRESS(' ', c);
! 				}
! 				else {
! 					dbputc(' ');
! 				}
! 			}
! 			/* compress digraphs */
! 			else if (IS_A_DICODE(c, my_yytext[i + 1])
! 				 && symput < symbols
! 				 && i + 1 != symbol[symput].first
! 				 ) {
! 				c = DICODE_COMPRESS(c, my_yytext[i + 1]);
! 				++i;
! 			}
! 			dbputc((int) c);
! 			blank = NO;
  			
! 			/* skip compressed characters */
! 			if (c < ' ') {
! 				++i;
  				
! 				/* skip blanks before a preprocesor keyword */
! 				/* note: don't use isspace() because \f and \v
! 				   are used for keywords */
! 				while ((j = my_yytext[i]) == ' ' || j == '\t') {
! 					++i;
! 				}
! 				/* skip the rest of the keyword */
! 				while (isalpha((unsigned char)my_yytext[i])) {
! 					++i;
! 				}
! 				/* skip space after certain keywords */
! 				if (keyword[c].delim != '\0') {
! 					while ((j = my_yytext[i]) == ' ' || j == '\t') {
! 						++i;
! 					}
! 				}
! 				/* skip a '(' after certain keywords */
! 				if (keyword[c].delim == '('
! 				    && my_yytext[i] == '(') {
! 					++i;
! 				}
! 				--i;	/* compensate for ++i in for() */
! 			} /* if compressed char */
! 		} /* else: not a symbol */
! 	} /* for(i) */
! 
! 	/* ignore trailing blanks */
! 	dbputc('\n');
  	dbputc('\n');
! 
! 	/* output any #define end marker */
! 	/* note: must not be part of #define so putsource() doesn't discard it
! 	   so findcalledbysub() can find it and return */
! 	if (symput < symbols && symbol[symput].type == DEFINEEND) {
! 		dbputc('\t');
! 		dbputc(DEFINEEND);
! 		dbputc('\n');
! 		dbputc('\n');	/* mark beginning of next source line */
! 		macrooffset = 0;
! 	}
! 	symbols = 0;
  }
  
--- 234,371 ----
  putcrossref(void)
  {
!     unsigned int i, j;
!     unsigned char c;
!     BOOL    blank;          /* blank indicator */
!     unsigned int symput = 0;     /* symbols output */
!     int     type;
! 
!     /* output the source line */
!     lineoffset = dboffset;
!     dboffset += fprintf(newrefs, "%d ", lineno);
  #ifdef PRINTF_RETVAL_BROKEN
!     dboffset = ftell(newrefs); /* fprintf doesn't return chars written */
  #endif
  
!     /* HBB 20010425: added this line: */
!     my_yytext[my_yyleng] = '\0';
  
!     blank = NO;
!     for (i = 0; i < my_yyleng; ++i) {
  		
! 	/* change a tab to a blank and compress blanks */
! 	if ((c = my_yytext[i]) == ' ' || c == '\t') {
! 	    blank = YES;
! 	} else if (symput < symbols && i == symbol[symput].first) {
! 	    /* look for the start of a symbol */
! 
! 	    /* check for compressed blanks */
! 	    if (blank == YES) {
! 		blank = NO;
! 		dbputc(' ');
! 	    }
! 	    dbputc('\n');	/* symbols start on a new line */
  			
! 	    /* output any symbol type */
! 	    if ((type = symbol[symput].type) != IDENT) {
! 		dbputc('\t');
! 		dbputc(type);
! 	    } else {
! 		type = ' ';
! 	    }
! 	    /* output the symbol */
! 	    j = symbol[symput].last;
! 	    c = my_yytext[j];
! 	    my_yytext[j] = '\0';
! 	    if (invertedindex == YES) {
! 		putposting(my_yytext + i, type);
! 	    }
! 	    writestring(my_yytext + i);
! 	    dbputc('\n');
! 	    my_yytext[j] = c;
! 	    i = j - 1;
! 	    ++symput;
! 	} else {
! 	    /* HBB: try to save some time by early-out handling of 
! 	     * non-compressed mode */
! 	    if (compress == NO) {
! 		if (blank == YES) {
! 		    dbputc(' ');
! 		    blank = NO;
! 		}
! 		j = i + strcspn(my_yytext+i, "\t ");
! 		if (symput < symbols
! 		    && j >= symbol[symput].first)
! 		    j = symbol[symput].first;
! 		c = my_yytext[j];
! 		my_yytext[j] = '\0';
! 		writestring(my_yytext + i);
! 		my_yytext[j] = c;
! 		i = j - 1;
! 		/* finished this 'i', continue with the blank */
! 		continue;
! 	    }
! 
! 	    /* check for compressed blanks */
! 	    if (blank == YES) {
! 		if (dicode2[c]) {
! 		    c = DICODE_COMPRESS(' ', c);
! 		} else {
! 		    dbputc(' ');
  		}
! 	    } else if (IS_A_DICODE(c, my_yytext[i + 1])
! 		       && symput < symbols
! 		       && i + 1 != symbol[symput].first) {
! 		/* compress digraphs */
! 		c = DICODE_COMPRESS(c, my_yytext[i + 1]);
! 		++i;
! 	    }
! 	    dbputc((int) c);
! 	    blank = NO;
  			
! 	    /* skip compressed characters */
! 	    if (c < ' ') {
! 		++i;
  				
! 		/* skip blanks before a preprocesor keyword */
! 		/* note: don't use isspace() because \f and \v
! 		   are used for keywords */
! 		while ((j = my_yytext[i]) == ' ' || j == '\t') {
! 		    ++i;
! 		}
! 		/* skip the rest of the keyword */
! 		while (isalpha((unsigned char)my_yytext[i])) {
! 		    ++i;
! 		}
! 		/* skip space after certain keywords */
! 		if (keyword[c].delim != '\0') {
! 		    while ((j = my_yytext[i]) == ' ' || j == '\t') {
! 			++i;
! 		    }
! 		}
! 		/* skip a '(' after certain keywords */
! 		if (keyword[c].delim == '('
! 		    && my_yytext[i] == '(') {
! 		    ++i;
! 		}
! 		--i;	/* compensate for ++i in for() */
! 	    } /* if compressed char */
! 	} /* else: not a symbol */
!     } /* for(i) */
! 
!     /* ignore trailing blanks */
!     dbputc('\n');
!     dbputc('\n');
! 
!     /* output any #define end marker */
!     /* note: must not be part of #define so putsource() doesn't discard it
!        so findcalledbysub() can find it and return */
!     if (symput < symbols && symbol[symput].type == DEFINEEND) {
! 	dbputc('\t');
! 	dbputc(DEFINEEND);
  	dbputc('\n');
! 	dbputc('\n');	/* mark beginning of next source line */
! 	macrooffset = 0;
!     }
!     symbols = 0;
  }
  

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** dir.c	19 Apr 2006 15:20:21 -0000	1.25
--- dir.c	21 Apr 2006 10:45:48 -0000	1.26
***************
*** 56,68 ****
  char	**srcdirs;		/* source directories */
  char	**srcfiles;		/* source files */
! int	nincdirs;		/* number of #include directories */
! int	nsrcdirs;		/* number of source directories */
! int	nsrcfiles;		/* number of source files */
! int	msrcfiles = SRCINC;	/* maximum number of source files */
  
  static	char	**incnames;	/* #include directory names without view pathing */
! static	int	mincdirs = DIRINC; /* maximum number of #include directories */
! static	int	msrcdirs;	/* maximum number of source directories */
! static	int	nvpsrcdirs;	/* number of view path source directories */
  
  static	struct	listitem {	/* source file names without view pathing */
--- 56,68 ----
  char	**srcdirs;		/* source directories */
  char	**srcfiles;		/* source files */
! unsigned long nincdirs;		/* number of #include directories */
! unsigned long nsrcdirs;		/* number of source directories */
! unsigned long nsrcfiles;	/* number of source files */
! unsigned long msrcfiles = SRCINC;	/* maximum number of source files */
  
  static	char	**incnames;	/* #include directory names without view pathing */
! static	unsigned long mincdirs = DIRINC; /* maximum number of #include directories */
! static	unsigned long msrcdirs; /* maximum number of source directories */
! static	unsigned long nvpsrcdirs; /* number of view path source directories */
  
  static	struct	listitem {	/* source file names without view pathing */
***************
*** 92,97 ****
  	/* get the current directory name */
  	if (getcwd(currentdir, PATHLEN) == NULL) {
! 		(void) fprintf(stderr, "cscope: warning: cannot get current directory name\n");
! 		(void) strcpy(currentdir, "<unknown>");
  	}
  	/* see if there is a view path and this directory is in it */
--- 92,97 ----
  	/* get the current directory name */
  	if (getcwd(currentdir, PATHLEN) == NULL) {
! 		fprintf(stderr, "cscope: warning: cannot get current directory name\n");
! 		strcpy(currentdir, "<unknown>");
  	}
  	/* see if there is a view path and this directory is in it */
***************
*** 118,150 ****
  sourcedir(char *dirlist)
  {
! 	char	path[PATHLEN + 1];
! 	char	*dir;
! 	int	i;
  
! 	makevpsrcdirs();		/* make the view source directory list */
! 	dirlist = stralloc(dirlist);	/* don't change environment variable text */
  	
! 	/* parse the directory list */
! 	dir = strtok(dirlist, DIRSEPS);
! 	while (dir != NULL) {
! 		int dir_len = strlen(dir);
! 
! 		addsrcdir(dir);
! 
! 		/* if it isn't a full path name and there is a 
! 		   multi-directory view path */
! 		if (*dirlist != '/' && vpndirs > 1) {
  			
! 			/* compute its path from higher view path source dirs */
! 			for (i = 1; i < nvpsrcdirs; ++i) {
! 				(void) sprintf(path, "%.*s/%s",
! 					       PATHLEN - 2 - dir_len,
! 					       srcdirs[i], dir);
! 				addsrcdir(path);
! 			}
! 		}
! 		dir = strtok(NULL, DIRSEPS);
! 	}
! 	free(dirlist);		/* HBB 20000421: avoid memory leaks */
  }
  
--- 118,150 ----
  sourcedir(char *dirlist)
  {
!     char    path[PATHLEN + 1];
!     char    *dir;
!     unsigned int i;
  
!     makevpsrcdirs();		/* make the view source directory list */
!     dirlist = stralloc(dirlist); /* don't change environment variable text */
  	
!     /* parse the directory list */
!     dir = strtok(dirlist, DIRSEPS);
!     while (dir != NULL) {
! 	int dir_len = strlen(dir);
! 
! 	addsrcdir(dir);
! 
! 	/* if it isn't a full path name and there is a 
! 	   multi-directory view path */
! 	if (*dirlist != '/' && vpndirs > 1) {
  			
! 	    /* compute its path from higher view path source dirs */
! 	    for (i = 1; i < nvpsrcdirs; ++i) {
! 		sprintf(path, "%.*s/%s",
! 			PATHLEN - 2 - dir_len,
! 			srcdirs[i], dir);
! 		addsrcdir(path);
! 	    }
! 	}
! 	dir = strtok(NULL, DIRSEPS);
!     }
!     free(dirlist);		/* HBB 20000421: avoid memory leaks */
  }
  
***************
*** 186,218 ****
  includedir(char *dirlist)
  {
! 	char	path[PATHLEN + 1];
! 	char	*dir;
! 	int	i;
  
! 	makevpsrcdirs();		/* make the view source directory list */
! 	dirlist = stralloc(dirlist);	/* don't change environment variable text */
  	
! 	/* parse the directory list */
! 	dir = strtok(dirlist, DIRSEPS);
! 	while (dir != NULL) {
! 		int dir_len = strlen(dir);
! 
! 		addincdir(dir, dir);
! 
! 		/* if it isn't a full path name and there is a 
! 		   multi-directory view path */
! 		if (*dirlist != '/' && vpndirs > 1) {
  			
! 			/* compute its path from higher view path source dirs */
! 			for (i = 1; i < nvpsrcdirs; ++i) {
! 				(void) sprintf(path, "%.*s/%s", 
! 					       PATHLEN - 2 - dir_len,
! 					       srcdirs[i], dir);
! 				addincdir(dir, path);
! 			}
! 		}
! 		dir = strtok(NULL, DIRSEPS);
! 	}
! 	free(dirlist);			/* HBB 20000421: avoid leaks */
  }
  
--- 186,218 ----
  includedir(char *dirlist)
  {
!     char    path[PATHLEN + 1];
!     char    *dir;
!     unsigned int i;
  
!     makevpsrcdirs();		/* make the view source directory list */
!     dirlist = stralloc(dirlist); /* don't change environment variable text */
  	
!     /* parse the directory list */
!     dir = strtok(dirlist, DIRSEPS);
!     while (dir != NULL) {
! 	size_t dir_len = strlen(dir);
! 
! 	addincdir(dir, dir);
! 
! 	/* if it isn't a full path name and there is a 
! 	   multi-directory view path */
! 	if (*dirlist != '/' && vpndirs > 1) {
  			
! 	    /* compute its path from higher view path source dirs */
! 	    for (i = 1; i < nvpsrcdirs; ++i) {
! 		sprintf(path, "%.*s/%s", 
! 			PATHLEN - 2 - dir_len,
! 			srcdirs[i], dir);
! 		addincdir(dir, path);
! 	    }
! 	}
! 	dir = strtok(NULL, DIRSEPS);
!     }
!     free(dirlist);			/* HBB 20000421: avoid leaks */
  }
  
***************
*** 263,372 ****
  makefilelist(void)
  {
! 	static	BOOL	firstbuild = YES;	/* first time through */
! 	FILE	*names;			/* name file pointer */
! 	char	dir[PATHLEN + 1];
! 	char	path[PATHLEN + 1];
! 	char    line[PATHLEN * 10];
! 	char	*file;
! 	char	*s;
! 	int	i;
  
! 	makevpsrcdirs();	/* make the view source directory list */
  
! 	/* if -i was NOT given and there are source file arguments */
! 	if (namefile == NULL && fileargc > 0) {
  		
! 		/* put them in a list that can be expanded */
! 		for (i = 0; i < fileargc; ++i) {
! 			file = fileargv[i];
! 			if (infilelist(file) == NO) {
! 				if ((s = inviewpath(file)) != NULL) {
! 					addsrcfile(s);
! 				} else {
! 					(void) fprintf(stderr, "cscope: cannot find file %s\n",
! 						       file);
! 					errorsfound = YES;
! 				}
! 			}
  		}
! 		return;
! 	}
! 
! 	/* see if a file name file exists */
! 	if (namefile == NULL && vpaccess(NAMEFILE, READ) == 0) {
! 		namefile = NAMEFILE;
  	}
  
! 	if (namefile == NULL) {
! 		/* No namefile --> make a list of all the source files
! 		 * in the directories */
! 		for (i = 0; i < nsrcdirs; ++i) {
! 			scan_dir(srcdirs[i], recurse_dir);
! 		}
! 		return;
  	}
  
! 	/* Came here --> there is a file of source file names */
  
! 	if (strcmp(namefile, "-") == 0)
! 		names = stdin;
! 	else if ((names = vpfopen(namefile, "r")) == NULL) {
! 		cannotopen(namefile);
! 		myexit(1);
! 	}
! 
! 	/* get the names in the file */
! 	while (fgets(line, 10*PATHLEN, names) != NULL) {
! 		char *point_in_line = line + (strlen(line) - 1);
! 		size_t length_of_name = 0;
! 		int unfinished_option = 0;
! 		BOOL done = NO;
! 
! 		/* Kill away \n left at end of fgets()'d string: */
! 		if (*point_in_line == '\n')
! 			*point_in_line = '\0';
  			
! 		/* Parse whitespace-terminated strings in line: */
! 		point_in_line = line;
! 		while (sscanf(point_in_line, "%s", path) == 1) {
! 			/* Have to store this length --- inviewpath() will
! 			 * modify path, later! */
! 			length_of_name = strlen(path);
  			  
! 			if (*path == '-') {	/* if an option */
! 				if (unfinished_option) {
! 					/* Can't have another option directly after an
! 					 * -I or -p option with no name after it! */
! 					(void) fprintf(stderr, "\
  cscope: Syntax error in namelist file %s: unfinished -I or -p option\n", 
! 						       namefile);
! 					unfinished_option = 0;
! 				}
  						
! 				i = path[1];
! 				switch (i) {
! 				case 'c':	/* ASCII characters only in crossref */
! 					compress = NO;
! 					break;
! 				case 'k':	/* ignore DFLT_INCDIR */
! 					kernelmode = YES;
! 					break;
! 				case 'q':	/* quick search */
! 					invertedindex = YES;
! 					break;
! 				case 'T':	/* truncate symbols to 8 characters */
! 					trun_syms = YES;
! 					break;
! 				case 'I':	/* #include file directory */
! 				case 'p':	/* file path components to display */
! 					s = path + 2;		/* for "-Ipath" */
! 					if (*s == '\0') {	/* if "-I path" */
! 						unfinished_option = i;
! 						break; 
! 					} 
! 
! 					/* this code block used several times in here
! 					 * --> make it a macro to avoid unnecessary
! 					 * duplication */
  #define HANDLE_OPTION_ARGUMENT(i, s)													   \
  					switch (i) {											   \
--- 263,372 ----
  makefilelist(void)
  {
!     static  BOOL    firstbuild = YES;       /* first time through */
!     FILE    *names;                 /* name file pointer */
!     char    dir[PATHLEN + 1];
!     char    path[PATHLEN + 1];
!     char    line[PATHLEN * 10];
!     char    *file;
!     char    *s;
!     unsigned int i;
  
!     makevpsrcdirs();	/* make the view source directory list */
  
!     /* if -i was NOT given and there are source file arguments */
!     if (namefile == NULL && fileargc > 0) {
  		
! 	/* put them in a list that can be expanded */
! 	for (i = 0; i < fileargc; ++i) {
! 	    file = fileargv[i];
! 	    if (infilelist(file) == NO) {
! 		if ((s = inviewpath(file)) != NULL) {
! 		    addsrcfile(s);
! 		} else {
! 		    fprintf(stderr, "cscope: cannot find file %s\n",
! 				   file);
! 		    errorsfound = YES;
  		}
! 	    }
  	}
+ 	return;
+     }
  
!     /* see if a file name file exists */
!     if (namefile == NULL && vpaccess(NAMEFILE, READ) == 0) {
! 	namefile = NAMEFILE;
!     }
! 
!     if (namefile == NULL) {
! 	/* No namefile --> make a list of all the source files
! 	 * in the directories */
! 	for (i = 0; i < nsrcdirs; ++i) {
! 	    scan_dir(srcdirs[i], recurse_dir);
  	}
+ 	return;
+     }
  
!     /* Came here --> there is a file of source file names */
  
!     if (strcmp(namefile, "-") == 0)
! 	names = stdin;
!     else if ((names = vpfopen(namefile, "r")) == NULL) {
! 	cannotopen(namefile);
! 	myexit(1);
!     }
! 
!     /* get the names in the file */
!     while (fgets(line, 10*PATHLEN, names) != NULL) {
! 	char *point_in_line = line + (strlen(line) - 1);
! 	size_t length_of_name = 0;
! 	int unfinished_option = 0;
! 	BOOL done = NO;
! 
! 	/* Kill away \n left at end of fgets()'d string: */
! 	if (*point_in_line == '\n')
! 	    *point_in_line = '\0';
  			
! 	/* Parse whitespace-terminated strings in line: */
! 	point_in_line = line;
! 	while (sscanf(point_in_line, "%s", path) == 1) {
! 	    /* Have to store this length --- inviewpath() will
! 	     * modify path, later! */
! 	    length_of_name = strlen(path);
  			  
! 	    if (*path == '-') {	/* if an option */
! 		if (unfinished_option) {
! 		    /* Can't have another option directly after an
! 		     * -I or -p option with no name after it! */
! 		    fprintf(stderr, "\
  cscope: Syntax error in namelist file %s: unfinished -I or -p option\n", 
! 				   namefile);
! 		    unfinished_option = 0;
! 		}
  						
! 		i = path[1];
! 		switch (i) {
! 		case 'c':	/* ASCII characters only in crossref */
! 		    compress = NO;
! 		    break;
! 		case 'k':	/* ignore DFLT_INCDIR */
! 		    kernelmode = YES;
! 		    break;
! 		case 'q':	/* quick search */
! 		    invertedindex = YES;
! 		    break;
! 		case 'T':	/* truncate symbols to 8 characters */
! 		    trun_syms = YES;
! 		    break;
! 		case 'I':	/* #include file directory */
! 		case 'p':	/* file path components to display */
! 		    s = path + 2;		/* for "-Ipath" */
! 		    if (*s == '\0') {	/* if "-I path" */
! 			unfinished_option = i;
! 			break; 
! 		    } 
! 
! 		    /* this code block used several times in here
! 		     * --> make it a macro to avoid unnecessary
! 		     * duplication */
  #define HANDLE_OPTION_ARGUMENT(i, s)													   \
  					switch (i) {											   \
***************
*** 382,386 ****
  					case 'p':	/* file path components to display */						   \
  						if (*(s) < '0' || *(s) > '9') {								   \
! 							(void) fprintf(stderr,								   \
  								       "cscope: -p option in file %s: missing or invalid numeric value\n", \
  								       namefile);							   \
--- 382,386 ----
  					case 'p':	/* file path components to display */						   \
  						if (*(s) < '0' || *(s) > '9') {								   \
! 							fprintf(stderr,								   \
  								       "cscope: -p option in file %s: missing or invalid numeric value\n", \
  								       namefile);							   \
***************
*** 394,474 ****
  					} /* switch(i) */
  
! 					/* ... and now call it for the first time */
! 					HANDLE_OPTION_ARGUMENT(i, s)
! 						break;
! 				default:
! 					(void) fprintf(stderr, "cscope: only -I, -c, -k, -p, and -T options can be in file %s\n", 
! 						       namefile);
! 				} /* switch(i) */
! 			} /* if('-') */
! 			else if (*path == '"') {
! 				/* handle quoted filenames... */
! 				size_t in = 1, out = 0;
! 				char *newpath = mymalloc(PATHLEN + 1);
! 
! 				while (in < PATHLEN && point_in_line[in] != '\0') {
! 					if (point_in_line[in] == '"') {
! 						newpath[out] = '\0';
! 						/* Tell outer loop to skip over this entire quoted string */
! 						length_of_name = in + 1;
! 						break;	/* found end of quoted string */
! 					} else if (point_in_line[in] == '\\'
! 						   && in < PATHLEN - 1
! 						   && (point_in_line[in + 1]== '"'
! 						       || point_in_line[in + 1] == '\\')) {
! 						/* un-escape \" or \\ sequence */
! 						newpath[out++] = point_in_line[in + 1];
! 						in += 2;
! 					} else {
! 						newpath[out++] = point_in_line[in++];
! 					}
! 				} /* while(in) */ 
! 				if (in >= PATHLEN) { /* safeguard against almost-overflow */
! 					newpath[out]='\0';
! 				}
! 
! 				/* If an -I or -p arguments was missing before,
! 				 * treat this name as the argument: */
! 				HANDLE_OPTION_ARGUMENT(unfinished_option, newpath);
! 				if (! done) {
! 					if ((s = inviewpath(newpath)) != NULL) {
! 						addsrcfile(s);
! 					} else {
! 						(void) fprintf(stderr,
! 							       "cscope: cannot find file %s\n",
! 							       newpath);
! 						errorsfound = YES;
! 					}
! 				}
! 			} /* if(quoted name) */
! 			else {
! 				/* ... so this is an ordinary file name, unquoted */
! 
! 				/* If an -I or -p arguments was missing before,
! 				 * treat this name as the argument: */
! 				HANDLE_OPTION_ARGUMENT(unfinished_option, path);
! 				if (!done) {
! 					if ((s = inviewpath(path)) != NULL) {
! 						addsrcfile(s);
! 					} else {
! 						(void) fprintf(stderr, "cscope: cannot find file %s\n",
! 							       path);
! 						errorsfound = YES;
! 					}
! 				}
! 			} /* else(ordinary name) */
! 
! 			point_in_line += length_of_name;
! 			while (isspace((unsigned char) *point_in_line))
! 				point_in_line ++;
! 		} /* while(sscanf(line)) */
! 	} /* while(fgets(line)) */
! 
! 	if (names == stdin)
! 		clearerr(stdin);
! 	else
! 		(void) fclose(names);
! 	firstbuild = NO;
! 	return;
  
  }
--- 394,474 ----
  					} /* switch(i) */
  
! 		    /* ... and now call it for the first time */
! 		    HANDLE_OPTION_ARGUMENT(i, s)
! 			break;
! 		default:
! 		    fprintf(stderr, "cscope: only -I, -c, -k, -p, and -T options can be in file %s\n", 
! 				   namefile);
! 		} /* switch(i) */
! 	    } /* if('-') */
! 	    else if (*path == '"') {
! 		/* handle quoted filenames... */
! 		size_t in = 1, out = 0;
! 		char *newpath = mymalloc(PATHLEN + 1);
! 
! 		while (in < PATHLEN && point_in_line[in] != '\0') {
! 		    if (point_in_line[in] == '"') {
! 			newpath[out] = '\0';
! 			/* Tell outer loop to skip over this entire quoted string */
! 			length_of_name = in + 1;
! 			break;	/* found end of quoted string */
! 		    } else if (point_in_line[in] == '\\'
! 			       && in < PATHLEN - 1
! 			       && (point_in_line[in + 1]== '"'
! 				   || point_in_line[in + 1] == '\\')) {
! 			/* un-escape \" or \\ sequence */
! 			newpath[out++] = point_in_line[in + 1];
! 			in += 2;
! 		    } else {
! 			newpath[out++] = point_in_line[in++];
! 		    }
! 		} /* while(in) */ 
! 		if (in >= PATHLEN) { /* safeguard against almost-overflow */
! 		    newpath[out]='\0';
! 		}
! 
! 		/* If an -I or -p arguments was missing before,
! 		 * treat this name as the argument: */
! 		HANDLE_OPTION_ARGUMENT(unfinished_option, newpath);
! 		if (! done) {
! 		    if ((s = inviewpath(newpath)) != NULL) {
! 			addsrcfile(s);
! 		    } else {
! 			fprintf(stderr,
! 				       "cscope: cannot find file %s\n",
! 				       newpath);
! 			errorsfound = YES;
! 		    }
! 		}
! 	    } /* if(quoted name) */
! 	    else {
! 		/* ... so this is an ordinary file name, unquoted */
! 
! 		/* If an -I or -p arguments was missing before,
! 		 * treat this name as the argument: */
! 		HANDLE_OPTION_ARGUMENT(unfinished_option, path);
! 		if (!done) {
! 		    if ((s = inviewpath(path)) != NULL) {
! 			addsrcfile(s);
! 		    } else {
! 			fprintf(stderr, "cscope: cannot find file %s\n",
! 				       path);
! 			errorsfound = YES;
! 		    }
! 		}
! 	    } /* else(ordinary name) */
! 
! 	    point_in_line += length_of_name;
! 	    while (isspace((unsigned char) *point_in_line))
! 		point_in_line ++;
! 	} /* while(sscanf(line)) */
!     } /* while(fgets(line)) */
! 
!     if (names == stdin)
! 	clearerr(stdin);
!     else
! 	fclose(names);
!     firstbuild = NO;
!     return;
  
  }
***************
*** 515,520 ****
  }
  
- /* see if this is a source file */
  
  static BOOL
  issrcfile(char *path)
--- 515,520 ----
  }
  
  
+ /* see if this is a source file */
  static BOOL
  issrcfile(char *path)
***************
*** 580,638 ****
  }
  
- /* add an include file to the source file list */
  
  void
  incfile(char *file, char *type)
  {
! 	char	name[PATHLEN + 1];
! 	char	path[PATHLEN + 1];
! 	char	*s;
! 	int	i;
! 	
! 	/* see if the file is already in the source file list */
! 	if (infilelist(file) == YES) {
! 		return;
! 	}
! 	/* look in current directory if it was #include "file" */
! 	if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
! 		addsrcfile(s);
! 	} else {
! 		int file_len = strlen(file);
  
! 		/* search for the file in the #include directory list */
! 		for (i = 0; i < nincdirs; ++i) {
! 			
! 			/* don't include the file from two directories */
! 			(void) sprintf(name, "%.*s/%s",
! 				       PATHLEN - 2 - file_len, incnames[i],
! 				       file);
! 			if (infilelist(name) == YES) {
! 				break;
! 			}
! 			/* make sure it exists and is readable */
! 			(void) sprintf(path, "%.*s/%s",
! 				       PATHLEN - 2 - file_len, incdirs[i],
! 				       file);
! 			if (access(compath(path), READ) == 0) {
! 				addsrcfile(path);
! 				break;
! 			}
! 		}
  	}
  }
  
- /* see if the file is already in the list */
  
  BOOL
  infilelist(char *path)
  {
! 	struct	listitem *p;
  
! 	for (p = srcnames[hash(compath(path)) % HASHMOD]; p != NULL; p = p->next) {
! 		if (strequal(path, p->text)) {
! 			return(YES);
! 		}
  	}
! 	return(NO);
  }
  
--- 580,639 ----
  }
  
  
+ /* add an include file to the source file list */
  void
  incfile(char *file, char *type)
  {
!     char    name[PATHLEN + 1];
!     char    path[PATHLEN + 1];
!     char    *s;
!     unsigned int i;
  
!     /* see if the file is already in the source file list */
!     if (infilelist(file) == YES) {
! 	return;
!     }
!     /* look in current directory if it was #include "file" */
!     if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
! 	addsrcfile(s);
!     } else {
! 	size_t file_len = strlen(file);
! 
! 	/* search for the file in the #include directory list */
! 	for (i = 0; i < nincdirs; ++i) {
! 	    /* don't include the file from two directories */
! 	    sprintf(name, "%.*s/%s",
! 		    PATHLEN - 2 - file_len, incnames[i],
! 		    file);
! 	    if (infilelist(name) == YES) {
! 		break;
! 	    }
! 	    /* make sure it exists and is readable */
! 	    sprintf(path, "%.*s/%s",
! 		    PATHLEN - 2 - file_len, incdirs[i],
! 		    file);
! 	    if (access(compath(path), READ) == 0) {
! 		addsrcfile(path);
! 		break;
! 	    }
  	}
+     }
  }
  
  
+ /* see if the file is already in the list */
  BOOL
  infilelist(char *path)
  {
!     struct listitem *p;
  
!     for (p = srcnames[hash(compath(path)) % HASHMOD];
! 	 p != NULL;
! 	 p = p->next) {
! 	if (strequal(path, p->text)) {
! 	    return(YES);
  	}
!     }
!     return(NO);
  }
  
***************
*** 642,667 ****
  inviewpath(char *file)
  {
! 	static	char	path[PATHLEN + 1];
! 	int	i;
  
! 	/* look for the file */
! 	if (access(compath(file), READ) == 0) {
! 		return(file);
! 	}
! 	/* if it isn't a full path name and there is a multi-directory view path */
! 	if (*file != '/' && vpndirs > 1) {
! 		int file_len = strlen(file);
! 
! 		/* compute its path from higher view path source dirs */
! 		for (i = 1; i < nvpsrcdirs; ++i) {
! 			(void) sprintf(path, "%.*s/%s",
! 				       PATHLEN - 2 - file_len, srcdirs[i],
! 				       file);
! 			if (access(compath(path), READ) == 0) {
! 				return(path);
! 			}
! 		}
  	}
! 	return(NULL);
  }
  
--- 643,670 ----
  inviewpath(char *file)
  {
!     static char	path[PATHLEN + 1];
!     unsigned int i;
  
!     /* look for the file */
!     if (access(compath(file), READ) == 0) {
! 	return(file);
!     }
! 
!     /* if it isn't a full path name and there is a multi-directory
!      * view path */
!     if (*file != '/' && vpndirs > 1) {
! 	int file_len = strlen(file);
! 
! 	/* compute its path from higher view path source dirs */
! 	for (i = 1; i < nvpsrcdirs; ++i) {
! 	    sprintf(path, "%.*s/%s",
! 		    PATHLEN - 2 - file_len, srcdirs[i],
! 		    file);
! 	    if (access(compath(path), READ) == 0) {
! 		return(path);
! 	    }
  	}
!     }
!     return(NULL);
  }
  

Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** display.c	27 Oct 2004 11:32:46 -0000	1.26
--- display.c	21 Apr 2006 10:45:48 -0000	1.27
***************
*** 65,81 ****
  int	booklen;		/* OGS book name display field length */
  int	*displine;		/* screen line of displayed reference */
! int	disprefs;		/* displayed references */
  int	field;			/* input field */
  int	filelen;		/* file name display field length */
  int	fcnlen;			/* function name display field length */
! int	mdisprefs;		/* maximum displayed references */
! int	nextline;		/* next line to be shown */
  FILE	*nonglobalrefs;		/* non-global references file */
  int	numlen;			/* line number display field length */
! int	topline = 1;		/* top line of page */
  int	bottomline;		/* bottom line of page */
  long	searchcount;		/* count of files searched */
  int	subsystemlen;		/* OGS subsystem name display field length */
! int	totallines;		/* total reference lines */
  unsigned fldcolumn;		/* input field column */
  
--- 65,81 ----
  int	booklen;		/* OGS book name display field length */
  int	*displine;		/* screen line of displayed reference */
! unsigned int disprefs;		/* displayed references */
  int	field;			/* input field */
  int	filelen;		/* file name display field length */
  int	fcnlen;			/* function name display field length */
! unsigned int mdisprefs;		/* maximum displayed references */
! unsigned int nextline;		/* next line to be shown */
  FILE	*nonglobalrefs;		/* non-global references file */
  int	numlen;			/* line number display field length */
! unsigned int topline = 1;		/* top line of page */
  int	bottomline;		/* bottom line of page */
  long	searchcount;		/* count of files searched */
  int	subsystemlen;		/* OGS subsystem name display field length */
! unsigned int totallines;	/* total reference lines */
  unsigned fldcolumn;		/* input field column */
  
***************
*** 144,374 ****
  display(void)
  {
! 	char	*subsystem;		/* OGS subsystem name */
! 	char	*book;			/* OGS book name */
! 	char	file[PATHLEN + 1];	/* file name */
! 	char	function[PATLEN + 1];	/* function name */
! 	char	linenum[NUMLEN + 1];	/* line number */
! 	int	screenline;		/* screen line number */
! 	int	width;			/* source line display width */
! 	int	i;
! 	char	*s;
! 
! 	/* see if this is the initial display */
! 	erase();
! 	if (refsfound == NULL) {
  #if CCS
! 		if (displayversion == YES) {
! 			printw("cscope %s", ESG_REL);
! 		}
! 		else {
! 			printw("cscope");
! 		}
  #else
! 		printw("Cscope version %d%s", FILEVERSION, FIXVERSION);
  #endif
! 		move(0, COLS - (int) sizeof(helpstring));
! 		addstr(helpstring);
! 	} else if (totallines == 0) {
! 		/* if no references were found */
! 		/* redisplay the last message */
! 		addstr(lastmsg);
  	} else {
! 		/* 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 */
! 		move(2, 2);
! 		if (ogs == YES && field != FILENAME) {
! 			printw("%-*s ", subsystemlen, "Subsystem");
! 			printw("%-*s ", booklen, "Book");
! 		}
! 		if (dispcomponents > 0)
! 			printw("%-*s ", filelen, "File");
  
! 		if (field == SYMBOL || field == CALLEDBY || field == CALLING) {
! 			printw("%-*s ", fcnlen, "Function");
! 		}
! 		if (field != FILENAME) {
! 			addstr("Line");
! 		}
! 		addch('\n');
  
! 		/* if at end of file go back to beginning */
! 		if (nextline > totallines) {
! 			seekline(1);
! 		}
! 		/* calculate the source text column */
  
! 		width = COLS - numlen - 3;
  
  		if (ogs == YES) {
! 			width -= subsystemlen + booklen + 2;
  		}
  		if (dispcomponents > 0) {
! 			width -= filelen + 1;
! 		}
! 		if (field == SYMBOL || field == CALLEDBY || field == CALLING) {
! 			width -= fcnlen + 1;
  		}
  
! 		/* until the max references have been displayed or 
! 		   there is no more room */
! 		topline = nextline;
! 		for (disprefs = 0, screenline = REFLINE;
! 		     disprefs < mdisprefs && screenline <= lastdispline;
! 		     ++disprefs, ++screenline) {
! 			/* read the reference line */
! 			if (fscanf(refsfound, "%s%s%s %[^\n]", file, function, 
! 			    linenum, tempstring) < 4) {
! 				break;
! 			}
! 			++nextline;
! 			displine[disprefs] = screenline;
! 			
! 			/* if no mouse, display the selection number */
! 			if (mouse == YES) {
! 				addch(' ');
! 			} else {
! 				printw("%c", dispchars[disprefs]);
! 			}
! 
! 			/* display any change mark */
! 			if (changing == YES && 
! 			    change[topline + disprefs - 1] == YES) {
! 				addch('>');
! 			} else {
! 				addch(' ');
! 			}
! 
! 			/* display the file name */
! 			if (field == FILENAME) {
! 				printw("%-*s ", filelen, file);
! 			} else {
! 				/* if OGS, display the subsystem and book names */
! 				if (ogs == YES) {
! 					ogsnames(file, &subsystem, &book);
! 					printw("%-*.*s ", subsystemlen, subsystemlen, subsystem);
! 					printw("%-*.*s ", booklen, booklen, book);
! 				}
! 				/* display the requested path components */
! 				if (dispcomponents > 0) {
! 					printw("%-*.*s ", filelen, filelen,
! 						pathcomponents(file, dispcomponents));
! 				}
! 			} /* else(field == FILENAME) */
! 
! 			/* display the function name */
! 			if (field == SYMBOL || field == CALLEDBY || field == CALLING) {
! 				printw("%-*.*s ", fcnlen, fcnlen, function);
! 			}
! 			if (field == FILENAME) {
! 				addch('\n');	/* go to next line */
! 				continue;
! 			}
! 
! 			/* display the line number */
! 			printw("%*s ", numlen, linenum);
! 			/* there may be tabs in egrep output */
! 			while ((s = strchr(tempstring, '\t')) != NULL) {
! 				*s = ' ';
! 			}
! 
! 			/* display the source line */
! 			s = tempstring;
! 			for (;;) {
! 				/* see if the source line will fit */
! 				if ((i = strlen(s)) > width) {
  					
! 					/* find the nearest blank */
! 					for (i = width; s[i] != ' ' && i > 0; --i) {
! 						;
! 					}
! 					if (i == 0) {
! 						i = width;	/* no blank */
! 					}
! 				}
! 				/* print up to this point */
! 				printw("%.*s", i, s);
! 				s += i;
  				
! 				/* if line didn't wrap around */
! 				if (i < width) {
! 					addch('\n');	/* go to next line */
! 				}
! 				/* skip blanks */
! 				while (*s == ' ') {
! 					++s;
! 				}
! 				/* see if there is more text */
! 				if (*s == '\0') {
! 					break;
! 				}
! 				/* if the source line is too long */
! 				if (++screenline > lastdispline) {
! 
! 					/* if this is the first displayed line,
! 					   display what will fit on the screen */
! 					if (topline == nextline -1) {
! 						disprefs++;
! 						/* break out of two loops */
! 						goto endrefs;
! 					}
  					
! 					/* erase the reference */
! 					while (--screenline >= displine[disprefs]) {
! 						move(screenline, 0);
! 						clrtoeol();
! 					}
! 					++screenline;
  					 
! 					/* go back to the beginning of this reference */
! 					--nextline;
! 					seekline(nextline);
! 					goto endrefs;
! 				}
! 				/* indent the continued source line */
! 				move(screenline, COLS - width);
! 			} /* for(ever) */
! 		} /* for(reference output lines) */
! 	endrefs:
! 		/* position the cursor for the message */
! 		i = FLDLINE - 1;
! 		if (screenline < i) {
! 			addch('\n');
! 		}
! 		else {
! 			move(i, 0);
! 		}
! 		/* check for more references */
! 		i = totallines - nextline + 1;
! 		bottomline = nextline;
! 		if (i > 0) {
! 			s = "s";
! 			if (i == 1) {
! 				s = "";
! 			}
! 			printw("* %d more line%s - press the space bar to display more *", i, s);
! 		}
! 		/* if this is the last page of references */
! 		else if (topline > 1 && nextline > totallines) {
! 			addstr("* Press the space bar to display the first lines again *");
! 		}
  	}
! 	/* display the input fields */
! 	move(FLDLINE, 0);
! 	for (i = 0; i < FIELDS; ++i) {
! 		printw("%s %s:\n", fields[i].text1, fields[i].text2);
  	}
! 	/* display any prompt */
! 	if (changing == YES) {
! 		move(PRLINE, 0);
! 		addstr(selprompt);
  	}
! 	drawscrollbar(topline, nextline);	/* display the scrollbar */
! 	refresh();
  }
  
--- 144,374 ----
  display(void)
  {
!     char    *subsystem;             /* OGS subsystem name */
!     char    *book;                  /* OGS book name */
!     char    file[PATHLEN + 1];      /* file name */
!     char    function[PATLEN + 1];   /* function name */
!     char    linenum[NUMLEN + 1];    /* line number */
!     int     screenline;             /* screen line number */
!     int     width;                  /* source line display width */
!     int     i;
!     char    *s;
! 
!     /* see if this is the initial display */
!     erase();
!     if (refsfound == NULL) {
  #if CCS
! 	if (displayversion == YES) {
! 	    printw("cscope %s", ESG_REL);
! 	}
! 	else {
! 	    printw("cscope");
! 	}
  #else
! 	printw("Cscope version %d%s", FILEVERSION, FIXVERSION);
  #endif
! 	move(0, COLS - (int) sizeof(helpstring));
! 	addstr(helpstring);
!     } else if (totallines == 0) {
! 	/* if no references were found */
! 	/* redisplay the last message */
! 	addstr(lastmsg);
!     } else {
! 	/* 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 */
! 	move(2, 2);
! 	if (ogs == YES && field != FILENAME) {
! 	    printw("%-*s ", subsystemlen, "Subsystem");
! 	    printw("%-*s ", booklen, "Book");
! 	}
! 	if (dispcomponents > 0)
! 	    printw("%-*s ", filelen, "File");
  
! 	if (field == SYMBOL || field == CALLEDBY || field == CALLING) {
! 	    printw("%-*s ", fcnlen, "Function");
! 	}
! 	if (field != FILENAME) {
! 	    addstr("Line");
! 	}
! 	addch('\n');
  
! 	/* if at end of file go back to beginning */
! 	if (nextline > totallines) {
! 	    seekline(1);
! 	}
! 	/* calculate the source text column */
  
! 	width = COLS - numlen - 3;
  
+ 	if (ogs == YES) {
+ 	    width -= subsystemlen + booklen + 2;
+ 	}
+ 	if (dispcomponents > 0) {
+ 	    width -= filelen + 1;
+ 	}
+ 	if (field == SYMBOL || field == CALLEDBY || field == CALLING) {
+ 	    width -= fcnlen + 1;
+ 	}
+ 
+ 	/* until the max references have been displayed or 
+ 	   there is no more room */
+ 	topline = nextline;
+ 	for (disprefs = 0, screenline = REFLINE;
+ 	     disprefs < mdisprefs && screenline <= lastdispline;
+ 	     ++disprefs, ++screenline) {
+ 	    /* read the reference line */
+ 	    if (fscanf(refsfound, "%s%s%s %[^\n]", file, function, 
+ 		       linenum, tempstring) < 4) {
+ 		break;
+ 	    }
+ 	    ++nextline;
+ 	    displine[disprefs] = screenline;
+ 			
+ 	    /* if no mouse, display the selection number */
+ 	    if (mouse == YES) {
+ 		addch(' ');
+ 	    } else {
+ 		printw("%c", dispchars[disprefs]);
+ 	    }
+ 
+ 	    /* display any change mark */
+ 	    if (changing == YES && 
+ 		change[topline + disprefs - 1] == YES) {
+ 		addch('>');
+ 	    } else {
+ 		addch(' ');
+ 	    }
+ 
+ 	    /* display the file name */
+ 	    if (field == FILENAME) {
+ 		printw("%-*s ", filelen, file);
+ 	    } else {
+ 		/* if OGS, display the subsystem and book names */
  		if (ogs == YES) {
! 		    ogsnames(file, &subsystem, &book);
! 		    printw("%-*.*s ", subsystemlen, subsystemlen, subsystem);
! 		    printw("%-*.*s ", booklen, booklen, book);
  		}
+ 		/* display the requested path components */
  		if (dispcomponents > 0) {
! 		    printw("%-*.*s ", filelen, filelen,
! 			   pathcomponents(file, dispcomponents));
  		}
+ 	    } /* else(field == FILENAME) */
  
! 	    /* display the function name */
! 	    if (field == SYMBOL || field == CALLEDBY || field == CALLING) {
! 		printw("%-*.*s ", fcnlen, fcnlen, function);
! 	    }
! 	    if (field == FILENAME) {
! 		addch('\n');	/* go to next line */
! 		continue;
! 	    }
! 
! 	    /* display the line number */
! 	    printw("%*s ", numlen, linenum);
! 	    /* there may be tabs in egrep output */
! 	    while ((s = strchr(tempstring, '\t')) != NULL) {
! 		*s = ' ';
! 	    }
! 
! 	    /* display the source line */
! 	    s = tempstring;
! 	    for (;;) {
! 		/* see if the source line will fit */
! 		if ((i = strlen(s)) > width) {
  					
! 		    /* find the nearest blank */
! 		    for (i = width; s[i] != ' ' && i > 0; --i) {
! 			;
! 		    }
! 		    if (i == 0) {
! 			i = width;	/* no blank */
! 		    }
! 		}
! 		/* print up to this point */
! 		printw("%.*s", i, s);
! 		s += i;
  				
! 		/* if line didn't wrap around */
! 		if (i < width) {
! 		    addch('\n');	/* go to next line */
! 		}
! 		/* skip blanks */
! 		while (*s == ' ') {
! 		    ++s;
! 		}
! 		/* see if there is more text */
! 		if (*s == '\0') {
! 		    break;
! 		}
! 		/* if the source line is too long */
! 		if (++screenline > lastdispline) {
! 
! 		    /* if this is the first displayed line,
! 		       display what will fit on the screen */
! 		    if (topline == nextline -1) {
! 			disprefs++;
! 			/* break out of two loops */
! 			goto endrefs;
! 		    }
  					
! 		    /* erase the reference */
! 		    while (--screenline >= displine[disprefs]) {
! 			move(screenline, 0);
! 			clrtoeol();
! 		    }
! 		    ++screenline;
  					 
! 		    /* go back to the beginning of this reference */
! 		    --nextline;
! 		    seekline(nextline);
! 		    goto endrefs;
! 		}
! 		/* indent the continued source line */
! 		move(screenline, COLS - width);
! 	    } /* for(ever) */
! 	} /* for(reference output lines) */
!     endrefs:
! 	/* position the cursor for the message */
! 	i = FLDLINE - 1;
! 	if (screenline < i) {
! 	    addch('\n');
  	}
! 	else {
! 	    move(i, 0);
  	}
! 	/* check for more references */
! 	i = totallines - nextline + 1;
! 	bottomline = nextline;
! 	if (i > 0) {
! 	    s = "s";
! 	    if (i == 1) {
! 		s = "";
! 	    }
! 	    printw("* %d more line%s - press the space bar to display more *", i, s);
! 	}
! 	/* if this is the last page of references */
! 	else if (topline > 1 && nextline > totallines) {
! 	    addstr("* Press the space bar to display the first lines again *");
  	}
!     }
!     /* display the input fields */
!     move(FLDLINE, 0);
!     for (i = 0; i < FIELDS; ++i) {
! 	printw("%s %s:\n", fields[i].text1, fields[i].text2);
!     }
!     /* display any prompt */
!     if (changing == YES) {
! 	move(PRLINE, 0);
! 	addstr(selprompt);
!     }
!     drawscrollbar(topline, nextline);	/* display the scrollbar */
!     refresh();
  }
  
***************
*** 412,420 ****
  search(void)
  {
- 	char	*subsystem;		/* OGS subsystem name */
- 	char 	*book;			/* OGS book name */
- 	char	file[PATHLEN + 1];	/* file name */
- 	char	function[PATLEN + 1];	/* function name */
- 	char	linenum[NUMLEN + 1];	/* line number */
  	char	*findresult = NULL;	/* find function output */
  	BOOL	funcexist = YES;		/* find "function" error */
--- 412,415 ----
***************
*** 422,426 ****
  	sighandler_t savesig;		/* old value of signal */
  	FP	f;			/* searching function */
! 	int	c, i;
  	
  	/* open the references found file for writing */
--- 417,421 ----
  	sighandler_t savesig;		/* old value of signal */
  	FP	f;			/* searching function */
! 	int	c;
  	
  	/* open the references found file for writing */
***************
*** 434,438 ****
  	searchcount = 0;
  	savesig = signal(SIGINT, jumpback);
! 	if (sigsetjmp(env,1) == 0) {
  		f = fields[field].findfcn;
  		if (f == findregexp || f == findstring) {
--- 429,433 ----
  	searchcount = 0;
  	savesig = signal(SIGINT, jumpback);
! 	if (sigsetjmp(env, 1) == 0) {
  		f = fields[field].findfcn;
  		if (f == findregexp || f == findstring) {
***************
*** 688,692 ****
  
  void
! seekline(int line) 
  {
  	int	c;
--- 683,687 ----
  
  void
! seekline(unsigned int line) 
  {
  	int	c;

Index: egrep.y
===================================================================
RCS file: /cvsroot/cscope/cscope/src/egrep.y,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** egrep.y	14 Mar 2005 17:23:05 -0000	1.10
--- egrep.y	21 Apr 2006 10:45:48 -0000	1.11
***************
*** 62,70 ****
  static	int state[NSTATES];
  static	char out[NSTATES];
! static	int line;
  static	int name[MAXLIN];
! static	int left[MAXLIN];
! static	int right[MAXLIN];
! static	int parent[MAXLIN];
  static	int foll[MAXLIN];
  static	int positions[MAXPOS];
--- 62,70 ----
  static	int state[NSTATES];
  static	char out[NSTATES];
! static	unsigned int line;
  static	int name[MAXLIN];
! static	unsigned int left[MAXLIN];
! static	unsigned int right[MAXLIN];
! static	unsigned int parent[MAXLIN];
  static	int foll[MAXLIN];
  static	int positions[MAXPOS];
***************
*** 92,100 ****
  static	void overflo(void);
  static	void add(int *array, int n);
! static	void follow(int v);
  static	int unary(int x, int d);
  static	int node(int x, int l, int r);
! static	int cclenter(int x);
! static	int enter(int x);
  
  static int yylex(void);
--- 92,100 ----
  static	void overflo(void);
  static	void add(int *array, int n);
! static	void follow(unsigned int v);
  static	int unary(int x, int d);
  static	int node(int x, int l, int r);
! static	unsigned int cclenter(int x);
! static	unsigned int enter(int x);
  
  static int yylex(void);
***************
*** 152,155 ****
--- 152,156 ----
  	message = s;
  	longjmp(env, 1);
+ 	return 1;		/* silence a warning */
  }
  
***************
*** 228,251 ****
  synerror(void)
  {
! 	yyerror("Syntax error");
  }
  
! static int
  enter(int x)
  {
! 	if(line >= MAXLIN) overflo();
! 	name[line] = x;
! 	left[line] = 0;
! 	right[line] = 0;
! 	return(line++);
  }
  
! static int
  cclenter(int x)
  {
! 	int linno;
! 	linno = enter(x);
! 	right[linno] = count;
! 	return (linno);
  }
  
--- 229,254 ----
  synerror(void)
  {
!     yyerror("Syntax error");
 ...
 
[truncated message content]

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

Modified Files:
	invlib.c 
Log Message:
Fix buffer overflow in invlib by making source bufferr same size as target.

Index: invlib.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/invlib.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** invlib.c	22 Nov 2005 11:28:55 -0000	1.16
--- invlib.c	21 Apr 2006 10:43:42 -0000	1.17
***************
*** 48,52 ****
  #define	DEBUG		0	/* debugging code and realloc messages */
  #define BLOCKSIZE	2 * BUFSIZ	/* logical block size */
- #define	LINEMAX		1000	/* sorted posting line max size */
  #define	POSTINC		10000	/* posting buffer size increment */
  #define SEP		' '	/* sorted posting field separator */
--- 48,51 ----
***************
*** 84,89 ****
  static	FILE	*outfile, *fpost;
  static	unsigned supersize = SUPERINC, supintsize;
! static	int	numpost, numlogblk, amtused, nextpost,
! 		lastinblk, numinvitems;
  static	POSTING	*POST, *postptr;
  static	unsigned long	*SUPINT, *supint, nextsupfing;
--- 83,88 ----
  static	FILE	*outfile, *fpost;
  static	unsigned supersize = SUPERINC, supintsize;
! static  unsigned int numpost, numlogblk, amtused, nextpost;
! static  unsigned int lastinblk, numinvitems;
  static	POSTING	*POST, *postptr;
  static	unsigned long	*SUPINT, *supint, nextsupfing;
***************
*** 113,117 ****
  	unsigned postsize = POSTINC * sizeof(POSTING);
  	unsigned long	*intptr;
! 	char	line[LINEMAX];
  	long	tlong;
  	PARAM	param;
--- 112,116 ----
  	unsigned postsize = POSTINC * sizeof(POSTING);
  	unsigned long	*intptr;
! 	char	line[TERMMAX];
  	long	tlong;
  	PARAM	param;
***************
*** 178,182 ****
  
  	/* now loop as long as more to read (till eof)  */
! 	while (fgets(line, LINEMAX, infile) != NULL) {
  #if DEBUG || STATS
  		++totpost;
--- 177,181 ----
  
  	/* now loop as long as more to read (till eof)  */
! 	while (fgets(line, TERMMAX, infile) != NULL) {
  #if DEBUG || STATS
  		++totpost;
***************
*** 354,506 ****
  invnewterm(void)
  {
! 	int	backupflag, i, j, maxback, holditems, gooditems, howfar;
! 	int	len, numwilluse, wdlen;
! 	char	*tptr, *tptr2, *tptr3;
! 	union {
! 		unsigned long	packword[2];
! 		ENTRY		e;
! 	} iteminfo;
  
! 	gooditems = 0;		/* initialize, to avoid warning */
! 	totterm++;
  #if STATS
! 	/* keep zipfian info on the distribution */
! 	if (numpost <= ZIPFSIZE)
! 		zipf[numpost]++;
! 	else
! 		zipf[0]++;
! #endif
! 	len = strlen(thisterm);
! 	wdlen = (len + (sizeof(long) - 1)) / sizeof(long);
! 	numwilluse = (wdlen + 3) * sizeof(long);
! 	/* new block if at least 1 item in block */
! 	if (numinvitems && numwilluse + amtused > sizeof(t_logicalblk)) {
! 		/* set up new block */
! 		if (supfing + 500 > SUPFING + supersize) {
! 			i = supfing - SUPFING;
! 			supersize += 20000;
! 			if ((SUPFING = (char *)realloc(SUPFING, supersize)) == NULL) {
! 				invcannotalloc(supersize);
! 				return(0);
! 			}
! 			supfing = i + SUPFING;
  #if DEBUG
! 			printf("reallocated superfinger space to %d, totpost=%ld\n", 
! 			    supersize, totpost);
  #endif
! 		}
! 		/* check that room for the offset as well */
! 		/* FIXME HBB: magic number alert (10) */
! 		if ((numlogblk + 10) > supintsize) {
! 			i = supint - SUPINT;
! 			supintsize += SUPERINC;
! 			if ((SUPINT = realloc(SUPINT, supintsize * sizeof(long))) == NULL) {
! 				invcannotalloc(supintsize * sizeof(long));
! 				return(0);
! 			}
! 			supint = i + SUPINT;
  #if DEBUG
! 			printf("reallocated superfinger offset to %d, totpost = %ld\n",
! 			    supintsize * sizeof(long), totpost);
  #endif
! 		}
! 		/* See if backup is efficatious  */
! 		backupflag = 0;
! 		maxback = (int) strlen(thisterm) / 10;
! 		holditems = numinvitems;
! 		if (maxback > numinvitems)
! 			maxback = numinvitems - 2;
! 		howfar = 0;
! 		while (--maxback > 0) {
! 			howfar++;
! 			iteminfo.packword[0] = logicalblk.invblk[--holditems * 2+(sizeof(long) - 1)];
! 			if ((i = iteminfo.e.size / 10) < maxback) {
! 				maxback = i;
! 				backupflag = howfar;
! 				gooditems = holditems;
! 				tptr2 = logicalblk.chrblk + iteminfo.e.offset;
! 			}
! 		}
! 		/* see if backup will occur  */
! 		if (backupflag) {
! 			numinvitems = gooditems;
! 		}
! 		logicalblk.invblk[0] = numinvitems;
! 		/* set forward pointer pointing to next */
! 		logicalblk.invblk[1] = numlogblk + 1; 
! 		/* set back pointer to last block */
! 		logicalblk.invblk[2] = numlogblk - 1;
! 		if (fwrite(logicalblk.chrblk, 1, sizeof(t_logicalblk), outfile) == 0) {
! 			invcannotwrite(indexfile);
! 			return(0);
! 		}
! 		amtused = 16;
! 		numlogblk++;
! 		/* check if had to back up, if so do it */
! 		if (backupflag) {
! 			/* find out where the end of the new block is */
! 			iteminfo.packword[0] = logicalblk.invblk[numinvitems*2+1];
! 			tptr3 = logicalblk.chrblk + iteminfo.e.offset;
! 			/* move the index for this block */
! 			for (i = 3; i <= (backupflag * 2 + 2); i++)
! 				logicalblk.invblk[i] = logicalblk.invblk[numinvitems*2+i];
! 			/* move the word into the super index */
! 			iteminfo.packword[0] = logicalblk.invblk[3];
! 			iteminfo.packword[1] = logicalblk.invblk[4];
! 			tptr2 = logicalblk.chrblk + iteminfo.e.offset;
! 			strncpy(supfing, tptr2, (int) iteminfo.e.size);
! 			*(supfing + iteminfo.e.size) = '\0';
  #if DEBUG
! 			printf("backup %d at term=%s to term=%s\n",
! 			    backupflag, thisterm, supfing);
  #endif
! 			*supint++ = nextsupfing;
! 			nextsupfing += strlen(supfing) + 1;
! 			supfing += strlen(supfing) + 1;
! 			/* now fix up the logical block */
! 			tptr = logicalblk.chrblk + lastinblk;
! 			lastinblk = sizeof(t_logicalblk);
! 			tptr2 = logicalblk.chrblk + lastinblk;
! 			j = tptr3 - tptr;
! 			while (tptr3 > tptr)
! 				*--tptr2 = *--tptr3;
! 			lastinblk -= j;
! 			amtused += (8 * backupflag + j);
! 			for (i = 3; i < (backupflag * 2 + 2); i += 2) {
! 				iteminfo.packword[0] = logicalblk.invblk[i];
! 				iteminfo.e.offset += (tptr2 - tptr3);
! 				logicalblk.invblk[i] = iteminfo.packword[0];
! 			}
! 			numinvitems = backupflag;
! 		} else { /* no backup needed */
! 			numinvitems = 0;
! 			lastinblk = sizeof(t_logicalblk);
! 			/* add new term to superindex */
! 			strcpy(supfing, thisterm);
! 			supfing += strlen(thisterm) + 1;
! 			*supint++ = nextsupfing;
! 			nextsupfing += strlen(thisterm) + 1;
! 		}
! 	}
! 	/* HBB 20010501: Fixed bug by replacing magic number '8' by
! 	 * what it actually represents. */
! 	lastinblk -= (numwilluse - 2 * sizeof(long));
! 	iteminfo.e.offset = lastinblk;
! 	iteminfo.e.size = len;
! 	iteminfo.e.space = 0;
! 	iteminfo.e.post = numpost;
! 	strncpy(logicalblk.chrblk + lastinblk, thisterm, len);
! 	amtused += numwilluse;
! 	logicalblk.invblk[(lastinblk/sizeof(long))+wdlen] = nextpost;
! 	if ((i = postptr - POST) > 0) {
! 		if (fwrite(POST, sizeof(POSTING), i, fpost) == 0) {
! 			invcannotwrite(postingfile);
! 			return(0);
! 		}
! 		nextpost += i * sizeof(POSTING);
! 	}
! 	logicalblk.invblk[3+2*numinvitems++] = iteminfo.packword[0];
! 	logicalblk.invblk[2+2*numinvitems] = iteminfo.packword[1];
! 	return(1);
  }
  
--- 353,508 ----
  invnewterm(void)
  {
!     int	backupflag, i, j, holditems, gooditems, howfar;
!     unsigned int maxback, len, numwilluse, wdlen;
!     char	*tptr, *tptr2, *tptr3;
! 
!     union {
! 	unsigned long	packword[2];
! 	ENTRY		e;
!     } iteminfo;
  
!     gooditems = 0;		/* initialize, to avoid warning */
!     totterm++;
  #if STATS
!     /* keep zipfian info on the distribution */
!     if (numpost <= ZIPFSIZE)
! 	zipf[numpost]++;
!     else
! 	zipf[0]++;
! #endif
!     len = strlen(thisterm);
!     wdlen = (len + (sizeof(long) - 1)) / sizeof(long);
!     /* HBB FIXME 20060419: magic number: 3 */
!     numwilluse = (wdlen + 3) * sizeof(long);
!     /* new block if at least 1 item in block */
!     if (numinvitems && numwilluse + amtused > sizeof(t_logicalblk)) {
! 	/* set up new block */
! 	if (supfing + 500 > SUPFING + supersize) {
! 	    i = supfing - SUPFING;
! 	    supersize += 20000;
! 	    if ((SUPFING = (char *)realloc(SUPFING, supersize)) == NULL) {
! 		invcannotalloc(supersize);
! 		return(0);
! 	    }
! 	    supfing = i + SUPFING;
  #if DEBUG
! 	    printf("reallocated superfinger space to %d, totpost=%ld\n", 
! 		   supersize, totpost);
  #endif
! 	}
! 	/* check that room for the offset as well */
! 	/* FIXME HBB: magic number alert (10) */
! 	if ((numlogblk + 10) > supintsize) {
! 	    i = supint - SUPINT;
! 	    supintsize += SUPERINC;
! 	    if ((SUPINT = realloc(SUPINT, supintsize * sizeof(long))) == NULL) {
! 		invcannotalloc(supintsize * sizeof(long));
! 		return(0);
! 	    }
! 	    supint = i + SUPINT;
  #if DEBUG
! 	    printf("reallocated superfinger offset to %d, totpost = %ld\n",
! 		   supintsize * sizeof(long), totpost);
  #endif
! 	}
! 	/* See if backup is efficatious  */
! 	backupflag = 0;
! 	maxback = (int) strlen(thisterm) / 10;
! 	holditems = numinvitems;
! 	if (maxback > numinvitems)
! 	    maxback = numinvitems - 2;
! 	howfar = 0;
! 	while (--maxback > 0) {
! 	    howfar++;
! 	    iteminfo.packword[0] =
! 		logicalblk.invblk[--holditems * 2 + (sizeof(long) - 1)];
! 	    if ((i = iteminfo.e.size / 10) < maxback) {
! 		maxback = i;
! 		backupflag = howfar;
! 		gooditems = holditems;
! 		tptr2 = logicalblk.chrblk + iteminfo.e.offset;
! 	    }
! 	}
! 	/* see if backup will occur  */
! 	if (backupflag) {
! 	    numinvitems = gooditems;
! 	}
! 	logicalblk.invblk[0] = numinvitems;
! 	/* set forward pointer pointing to next */
! 	logicalblk.invblk[1] = numlogblk + 1; 
! 	/* set back pointer to last block */
! 	logicalblk.invblk[2] = numlogblk - 1;
! 	if (fwrite(logicalblk.chrblk, 1, sizeof(t_logicalblk), outfile) == 0) {
! 	    invcannotwrite(indexfile);
! 	    return(0);
! 	}
! 	amtused = 16;
! 	numlogblk++;
! 	/* check if had to back up, if so do it */
! 	if (backupflag) {
! 	    /* find out where the end of the new block is */
! 	    iteminfo.packword[0] = logicalblk.invblk[numinvitems*2+1];
! 	    tptr3 = logicalblk.chrblk + iteminfo.e.offset;
! 	    /* move the index for this block */
! 	    for (i = 3; i <= (backupflag * 2 + 2); i++)
! 		logicalblk.invblk[i] = logicalblk.invblk[numinvitems*2+i];
! 	    /* move the word into the super index */
! 	    iteminfo.packword[0] = logicalblk.invblk[3];
! 	    iteminfo.packword[1] = logicalblk.invblk[4];
! 	    tptr2 = logicalblk.chrblk + iteminfo.e.offset;
! 	    strncpy(supfing, tptr2, (int) iteminfo.e.size);
! 	    *(supfing + iteminfo.e.size) = '\0';
  #if DEBUG
! 	    printf("backup %d at term=%s to term=%s\n",
! 		   backupflag, thisterm, supfing);
  #endif
! 	    *supint++ = nextsupfing;
! 	    nextsupfing += strlen(supfing) + 1;
! 	    supfing += strlen(supfing) + 1;
! 	    /* now fix up the logical block */
! 	    tptr = logicalblk.chrblk + lastinblk;
! 	    lastinblk = sizeof(t_logicalblk);
! 	    tptr2 = logicalblk.chrblk + lastinblk;
! 	    j = tptr3 - tptr;
! 	    while (tptr3 > tptr)
! 		*--tptr2 = *--tptr3;
! 	    lastinblk -= j;
! 	    amtused += (8 * backupflag + j);
! 	    for (i = 3; i < (backupflag * 2 + 2); i += 2) {
! 		iteminfo.packword[0] = logicalblk.invblk[i];
! 		iteminfo.e.offset += (tptr2 - tptr3);
! 		logicalblk.invblk[i] = iteminfo.packword[0];
! 	    }
! 	    numinvitems = backupflag;
! 	} else { /* no backup needed */
! 	    numinvitems = 0;
! 	    lastinblk = sizeof(t_logicalblk);
! 	    /* add new term to superindex */
! 	    strcpy(supfing, thisterm);
! 	    supfing += strlen(thisterm) + 1;
! 	    *supint++ = nextsupfing;
! 	    nextsupfing += strlen(thisterm) + 1;
! 	}
!     }
!     /* HBB 20010501: Fixed bug by replacing magic number '8' by
!      * what it actually represents. */
!     lastinblk -= (numwilluse - 2 * sizeof(long));
!     iteminfo.e.offset = lastinblk;
!     iteminfo.e.size = len;
!     iteminfo.e.space = 0;
!     iteminfo.e.post = numpost;
!     strncpy(logicalblk.chrblk + lastinblk, thisterm, len);
!     amtused += numwilluse;
!     logicalblk.invblk[(lastinblk/sizeof(long))+wdlen] = nextpost;
!     if ((i = postptr - POST) > 0) {
! 	if (fwrite(POST, sizeof(POSTING), i, fpost) == 0) {
! 	    invcannotwrite(postingfile);
! 	    return(0);
! 	}
! 	nextpost += i * sizeof(POSTING);
!     }
!     logicalblk.invblk[3+2*numinvitems++] = iteminfo.packword[0];
!     logicalblk.invblk[2+2*numinvitems] = iteminfo.packword[1];
!     return(1);
  }
  

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

Modified Files:
	input.c 
Log Message:
Fix up curses display before askforreturn() finishes.

Index: input.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/input.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** input.c	14 Mar 2005 17:24:46 -0000	1.13
--- input.c	21 Apr 2006 10:42:15 -0000	1.14
***************
*** 64,68 ****
  {
   	(void) sig;		/* 'use' it, to avoid a warning */
! 	(void) signal(SIGINT, catchint);
  	longjmp(env, 1);
  }
--- 64,69 ----
  {
   	(void) sig;		/* 'use' it, to avoid a warning */
! 
! 	signal(SIGINT, catchint);
  	longjmp(env, 1);
  }
***************
*** 79,240 ****
  mygetch(void)
  {
! 	sighandler_t savesig; /* old value of signal */
! 	int	c;
  
! 	/* change an interrupt signal to a break key character */
! 	if (setjmp(env) == 0) {
! 		savesig = signal(SIGINT, catchint);
! 		refresh();	/* update the display */
! 		mousereinit();	/* curses can change the menu number */
! 		if(prevchar) {
! 			c = prevchar;
! 			prevchar = 0;
! 		} else {
! 			c = -1;
! 			while (c == -1) {
! 				/* get a character from the terminal */
! 				c = getch();
! 				if ((c == -1) && (errno != EINTR))
! 					break;
! 			}
! 		}
! 	} else {	/* longjmp to here from signal handler */
! 		c = KEY_BREAK;
  	}
! 	(void) signal(SIGINT, savesig);
! 	return(c);
  }
  
- /* get a line from the terminal in non-canonical mode */
  
  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);
  }
  
--- 80,241 ----
  mygetch(void)
  {
!     sighandler_t savesig; /* old value of signal */
!     int c;
  
!     /* change an interrupt signal to a break key character */
!     if (setjmp(env) == 0) {
! 	savesig = signal(SIGINT, catchint);
! 	refresh();	/* update the display */
! 	mousereinit();	/* curses can change the menu number */
! 	if(prevchar) {
! 	    c = prevchar;
! 	    prevchar = 0;
! 	} else {
! 	    c = -1;
! 	    while (c == -1) {
! 		/* get a character from the terminal */
! 		c = getch();
! 		if ((c == -1) && (errno != EINTR))
! 		    break;
! 	    }
  	}
!     } else {	/* longjmp to here from signal handler */
! 	c = KEY_BREAK;
!     }
!     signal(SIGINT, savesig);
!     return(c);
  }
  
  
+ /* get a line from the terminal in non-canonical mode */
  int
  mygetline(char p[], char s[], unsigned size, int firstchar, BOOL iscaseless)
  {
!     int	c;
!     unsigned int i = 0, j;
!     char *sright;	/* substring to the right of the cursor */
!     unsigned 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);
  }
  
***************
*** 244,249 ****
  askforchar(void)
  {
! 	addstr("Type any character to continue: ");
! 	(void) mygetch();
  }
  
--- 245,250 ----
  askforchar(void)
  {
!     addstr("Type any character to continue: ");
!     mygetch();
  }
  
***************
*** 253,258 ****
  askforreturn(void)
  {
! 	(void) fprintf(stderr, "Press the RETURN key to continue: ");
! 	(void) getchar();
  }
  
--- 254,263 ----
  askforreturn(void)
  {
!     fprintf(stderr, "Press the RETURN key to continue: ");
!     getchar();
!     /* HBB 20060419: message probably messed up the screen --- redraw */
!     if (incurses == YES) {
! 	redrawwin(curscr);
!     }
  }
  
***************
*** 262,330 ****
  shellpath(char *out, int limit, char *in) 
  {
! 	char	*lastchar;
! 	char	*s, *v;
! 
! 	/* skip leading white space */
! 	while (isspace((unsigned char)*in)) {
! 		++in;
! 	}
! 	lastchar = out + limit - 1;
! 
! 	/* a tilde (~) by itself represents $HOME; followed by a name it
! 	   represents the $LOGDIR of that login name */
! 	if (*in == '~') {
! 		*out++ = *in++;	/* copy the ~ because it may not be expanded */
! 
! 		/* get the login name */
! 		s = out;
! 		while (s < lastchar && *in != '/' && *in != '\0' && !isspace((unsigned char)*in)) {
! 			*s++ = *in++;
! 		}
! 		*s = '\0';
  
! 		/* if the login name is null, then use $HOME */
! 		if (*out == '\0') {
! 			v = getenv("HOME");
! 		}
! 		else {	/* get the home directory of the login name */
! 			v = logdir(out);
! 		}
! 		/* copy the directory name */
! 		if (v != NULL) {
! 			(void) strcpy(out - 1, v);
! 			out += strlen(v) - 1;
! 		}
! 		else {	/* login not found, so ~ must be part of the file name */
! 			out += strlen(out);
! 		}
  	}
! 	/* get the rest of the path */
! 	while (out < lastchar && *in != '\0' && !isspace((unsigned char)*in)) {
  
! 		/* look for an environment variable */
! 		if (*in == '$') {
! 			*out++ = *in++;	/* copy the $ because it may not be expanded */
! 
! 			/* get the variable name */
! 			s = out;
! 			while (s < lastchar && *in != '/' && *in != '\0' &&
! 			    !isspace((unsigned char)*in)) {
! 				*s++ = *in++;
! 			}
! 			*s = '\0';
  	
! 			/* get its value */
! 			if ((v = getenv(out)) != NULL) {
! 				(void) strcpy(out - 1, v);
! 				out += strlen(v) - 1;
! 			}
! 			else {	/* var not found, so $ must be part of the file name */
! 				out += strlen(out);
! 			}
! 		}
! 		else {	/* ordinary character */
! 			*out++ = *in++;
! 		}
  	}
! 	*out = '\0';
  }
--- 267,335 ----
  shellpath(char *out, int limit, char *in) 
  {
!     char	*lastchar;
!     char	*s, *v;
  
!     /* skip leading white space */
!     while (isspace((unsigned char)*in)) {
! 	++in;
!     }
!     lastchar = out + limit - 1;
! 
!     /* a tilde (~) by itself represents $HOME; followed by a name it
!        represents the $LOGDIR of that login name */
!     if (*in == '~') {
! 	*out++ = *in++;	/* copy the ~ because it may not be expanded */
! 
! 	/* get the login name */
! 	s = out;
! 	while (s < lastchar && *in != '/' && *in != '\0' && !isspace((unsigned char)*in)) {
! 	    *s++ = *in++;
  	}
! 	*s = '\0';
  
! 	/* if the login name is null, then use $HOME */
! 	if (*out == '\0') {
! 	    v = getenv("HOME");
! 	}
! 	else {	/* get the home directory of the login name */
! 	    v = logdir(out);
! 	}
! 	/* copy the directory name */
! 	if (v != NULL) {
! 	    strcpy(out - 1, v);
! 	    out += strlen(v) - 1;
! 	}
! 	else {	/* login not found, so ~ must be part of the file name */
! 	    out += strlen(out);
! 	}
!     }
!     /* get the rest of the path */
!     while (out < lastchar && *in != '\0' && !isspace((unsigned char)*in)) {
! 
! 	/* look for an environment variable */
! 	if (*in == '$') {
! 	    *out++ = *in++;	/* copy the $ because it may not be expanded */
! 
! 	    /* get the variable name */
! 	    s = out;
! 	    while (s < lastchar && *in != '/' && *in != '\0' &&
! 		   !isspace((unsigned char)*in)) {
! 		*s++ = *in++;
! 	    }
! 	    *s = '\0';
  	
! 	    /* get its value */
! 	    if ((v = getenv(out)) != NULL) {
! 		strcpy(out - 1, v);
! 		out += strlen(v) - 1;
! 	    }
! 	    else {	/* var not found, so $ must be part of the file name */
! 		out += strlen(out);
! 	    }
! 	}
! 	else {	/* ordinary character */
! 	    *out++ = *in++;
  	}
!     }
!     *out = '\0';
  }

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

Modified Files:
	config.h.in configure configure.in 
Log Message:
#include <io.h> for setmode() prototype, if platform has it.

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** config.h.in	24 Feb 2004 15:13:20 -0000	1.17
--- config.h.in	21 Apr 2006 10:41:21 -0000	1.18
***************
*** 26,29 ****
--- 26,32 ----
  #undef HAVE_INTTYPES_H
  
+ /* Define to 1 if you have the <io.h> header file. */
+ #undef HAVE_IO_H
+ 
  /* Define to 1 if you have the `regex' library (-lregex). */
  #undef HAVE_LIBREGEX

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** configure	19 Apr 2006 14:30:16 -0000	1.26
--- configure	21 Apr 2006 10:41:21 -0000	1.27
***************
*** 5128,5132 ****
  
  
! for ac_header in fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 5128,5133 ----
  
  
! 
! for ac_header in fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h io.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** configure.in	24 Feb 2004 15:13:21 -0000	1.31
--- configure.in	21 Apr 2006 10:41:21 -0000	1.32
***************
*** 382,386 ****
  AC_HEADER_DIRENT
  AC_HEADER_STDC
! AC_CHECK_HEADERS(fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h)
  
  dnl Checks for typedefs, structures, and compiler characteristics.
--- 382,386 ----
  AC_HEADER_DIRENT
  AC_HEADER_STDC
! AC_CHECK_HEADERS(fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h io.h)
  
  dnl Checks for typedefs, structures, and compiler characteristics.

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

Modified Files:
	mypopen.c 
Log Message:
#include <io.h> for setmode() prototype, if platform has it.

Index: mypopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mypopen.c	30 Jan 2005 19:33:28 -0000	1.13
--- mypopen.c	21 Apr 2006 10:40:29 -0000	1.14
***************
*** 49,52 ****
--- 49,56 ----
  #endif
  
+ #ifdef HAVE_IO_H
+ # include <io.h>		/* for setmode() */
+ #endif
+ 
  static char const rcsid[] = "$Id$";
  
***************
*** 57,95 ****
  myopen(char *path, int flag, int mode)
  {
! 	/* opens a file descriptor and then sets close-on-exec for the file */
! 	int fd;
  
! 	/* 20020103: if file is not explicitly in Binary mode, make
! 	 * sure we override silly Cygwin behaviour of automatic binary
! 	 * mode for files in "binary mounted" paths */
  #if O_BINARY != O_TEXT
! 	if (! (flag | O_BINARY))
! 		flag |= O_TEXT;
  #endif
! 	if(mode)
! 		fd = open(path, flag, mode);
! 	else
! 		fd = open(path, flag);
  
  #ifdef __DJGPP__		/* FIXME: test feature, not platform */
! 	/* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it 
! 	 * always fails this call. Have to skip that step */
! 	if(fd != -1)
! 		return(fd);
  #endif
! 	if(fd != -1 && (fcntl(fd, F_SETFD, CLOSE_ON_EXEC) != -1))
! 		return(fd);
  
! 	else
  	{
! 		/* Ensure that if the fcntl fails and fd is valid, then
! 		   the file is closed properly. In general this should
! 		   not happen. */
! 		if (fd != -1)
  		{
! 			close (fd);
  		}
  
! 		return(-1);
  	}
  }
--- 61,99 ----
  myopen(char *path, int flag, int mode)
  {
!     /* opens a file descriptor and then sets close-on-exec for the file */
!     int fd;
  
!     /* 20020103: if file is not explicitly in Binary mode, make
!      * sure we override silly Cygwin behaviour of automatic binary
!      * mode for files in "binary mounted" paths */
  #if O_BINARY != O_TEXT
!     if (! (flag | O_BINARY))
! 	flag |= O_TEXT;
  #endif
!     if(mode)
! 	fd = open(path, flag, mode);
!     else
! 	fd = open(path, flag);
  
  #ifdef __DJGPP__		/* FIXME: test feature, not platform */
!     /* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it 
!      * always fails this call. Have to skip that step */
!     if(fd != -1)
! 	return(fd);
  #endif
!     if(fd != -1 && (fcntl(fd, F_SETFD, CLOSE_ON_EXEC) != -1))
! 	return(fd);
  
!     else
  	{
! 	    /* Ensure that if the fcntl fails and fd is valid, then
! 	       the file is closed properly. In general this should
! 	       not happen. */
! 	    if (fd != -1)
  		{
! 		    close (fd);
  		}
  
! 	    return(-1);
  	}
  }
***************
*** 98,123 ****
  myfopen(char *path, char *mode)
  {
! 	/* opens a file pointer and then sets close-on-exec for the file */
! 	FILE *fp;
  
! 	fp = fopen(path, mode);
  
  #ifdef SETMODE
! 	if (fp && ! strchr(mode, 'b')) {
! 		SETMODE(fileno(fp), O_TEXT);
! 	}
  #endif /* SETMODE */
  	
  #ifdef __DJGPP__ /* FIXME: test feature, not platform */
! 	/* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it 
! 	 * always fails this call. Have to skip that step */
! 	if(fp)
  #else
  	if(fp && (fcntl(fileno(fp), F_SETFD, CLOSE_ON_EXEC) != -1))
  #endif
! 		return(fp);
  
  	else
! 		return(NULL);
  }
  
--- 102,127 ----
  myfopen(char *path, char *mode)
  {
!     /* opens a file pointer and then sets close-on-exec for the file */
!     FILE *fp;
  
!     fp = fopen(path, mode);
  
  #ifdef SETMODE
!     if (fp && ! strchr(mode, 'b')) {
! 	SETMODE(fileno(fp), O_TEXT);
!     }
  #endif /* SETMODE */
  	
  #ifdef __DJGPP__ /* FIXME: test feature, not platform */
!     /* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it 
!      * always fails this call. Have to skip that step */
!     if(fp)
  #else
  	if(fp && (fcntl(fileno(fp), F_SETFD, CLOSE_ON_EXEC) != -1))
  #endif
! 	    return(fp);
  
  	else
! 	    return(NULL);
  }
  

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

Modified Files:
	dir.c 
Log Message:
Fix silly ooops from editing out d_ino test...

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** dir.c	19 Apr 2006 14:28:57 -0000	1.24
--- dir.c	19 Apr 2006 15:20:21 -0000	1.25
***************
*** 504,508 ****
  					} else if (issrcfile(path)
  						   && infilelist(path) == NO
! 						   && access(path, R_OK) == 0)
  						addsrcfile(path);
  					}
--- 504,508 ----
  					} else if (issrcfile(path)
  						   && infilelist(path) == NO
! 						   && access(path, R_OK) == 0) {
  						addsrcfile(path);
  					}

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

Modified Files:
	ChangeLog Makefile.in aclocal.m4 configure 
Log Message:
Autoreconf'ed to versions 2.59 / 1.9.6

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -r1.154 -r1.155
*** ChangeLog	21 Feb 2006 19:54:56 -0000	1.154
--- ChangeLog	19 Apr 2006 14:30:16 -0000	1.155
***************
*** 1,2 ****
--- 1,13 ----
+ 2006-04-19  Hans-Bernhard Broeker  <br...@ph...>
+ 
+ 	* src/dir.c (scan_dir): Get rid of d_ino check --- this field is
+ 	not reliably present in struct dirent, and doesn't achieve enough
+ 	to be worth autoconf-ing around.  Works around problems compiling on
+ 	Cygwin release 1.5.19.
+ 
+ 	* Makefile.in, aclocal.m4, configure, contrib/Makefile.in,
+ 	doc/Makefile.in, src/Makefile.in: Regenerated with current auto
+ 	tools (autoconf-2.59, automake 1.9.6).
+ 
  2006-02-21  Hans-Bernhard Broeker  <br...@ph...>
  

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.in	12 Feb 2004 18:14:04 -0000	1.7
--- Makefile.in	19 Apr 2006 14:30:16 -0000	1.8
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
  # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.9.6 from Makefile.am.
  # @configure_input@
  
! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 14,18 ****
  
  @SET_MAKE@
- 
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
--- 14,17 ----
***************
*** 22,26 ****
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
- 
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
--- 21,24 ----
***************
*** 36,40 ****
--- 34,77 ----
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ build_triplet = @build@
  host_triplet = @host@
+ LIBOBJDIR =
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ 	TODO compile config.guess config.sub depcomp install-sh \
+ 	missing mkinstalldirs ylwrap
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno configure.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+ 	install-exec-recursive install-info-recursive \
+ 	install-recursive installcheck-recursive installdirs-recursive \
+ 	pdf-recursive ps-recursive uninstall-info-recursive \
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+   { test ! -d $(distdir) \
+     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+          && rm -fr $(distdir); }; }
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
***************
*** 102,105 ****
--- 139,144 ----
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
  bindir = @bindir@
  build = @build@
***************
*** 124,127 ****
--- 163,167 ----
  localstatedir = @localstatedir@
  mandir = @mandir@
+ mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
***************
*** 131,174 ****
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
  SUBDIRS = doc src contrib
- 
  EXTRA_DIST = packages
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- 	ps-recursive install-info-recursive uninstall-info-recursive \
- 	all-recursive install-data-recursive install-exec-recursive \
- 	installdirs-recursive install-recursive uninstall-recursive \
- 	check-recursive installcheck-recursive
- DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- 	COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
- 	compile config.guess config.h.in config.sub configure \
- 	configure.in depcomp install-sh missing mkinstalldirs ylwrap
- DIST_SUBDIRS = $(SUBDIRS)
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
  .SUFFIXES:
! 
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
!  configure.lineno
! $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  Makefile
! Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
  
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
- $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- 	cd $(srcdir) && $(AUTOCONF)
  
! $(ACLOCAL_M4):  configure.in 
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
--- 171,212 ----
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  SUBDIRS = doc src contrib
  EXTRA_DIST = packages
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
  .SUFFIXES:
! am--refresh:
! 	@:
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
! 	@for dep in $?; do \
! 	  case '$(am__configure_deps)' in \
! 	    *$$dep*) \
! 	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
! 	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
! 		&& exit 0; \
! 	      exit 1;; \
! 	  esac; \
! 	done; \
! 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  Makefile
! .PRECIOUS: Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! 	@case '$?' in \
! 	  *config.status*) \
! 	    echo ' $(SHELL) ./config.status'; \
! 	    $(SHELL) ./config.status;; \
! 	  *) \
! 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
! 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
! 	esac;
  
! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
! $(top_srcdir)/configure:  $(am__configure_deps)
! 	cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
***************
*** 182,189 ****
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
! 
! $(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
  	cd $(top_srcdir) && $(AUTOHEADER)
! 	touch $(srcdir)/config.h.in
  
  distclean-hdr:
--- 220,227 ----
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
! $(srcdir)/config.h.in:  $(am__configure_deps) 
  	cd $(top_srcdir) && $(AUTOHEADER)
! 	rm -f stamp-h1
! 	touch $@
  
  distclean-hdr:
***************
*** 198,202 ****
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
! 	@set fnord $$MAKEFLAGS; amf=$$2; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
--- 236,246 ----
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
! 	@failcom='exit 1'; \
! 	for f in x $$MAKEFLAGS; do \
! 	  case $$f in \
! 	    *=* | --[!k]*);; \
! 	    *k*) failcom='fail=yes';; \
! 	  esac; \
! 	done; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
***************
*** 210,214 ****
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
--- 254,258 ----
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! 	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
***************
*** 218,222 ****
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
! 	@set fnord $$MAKEFLAGS; amf=$$2; \
  	dot_seen=no; \
  	case "$@" in \
--- 262,272 ----
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
! 	@failcom='exit 1'; \
! 	for f in x $$MAKEFLAGS; do \
! 	  case $$f in \
! 	    *=* | --[!k]*);; \
! 	    *k*) failcom='fail=yes';; \
! 	  esac; \
! 	done; \
  	dot_seen=no; \
  	case "$@" in \
***************
*** 239,243 ****
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
  	done && test -z "$$fail"
  tags-recursive:
--- 289,293 ----
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! 	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
***************
*** 250,261 ****
  	done
  
- ETAGS = etags
- ETAGSFLAGS =
- 
- CTAGS = ctags
- CTAGSFLAGS =
- 
- tags: TAGS
- 
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
--- 300,303 ----
***************
*** 266,269 ****
--- 308,312 ----
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
+ tags: TAGS
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
***************
*** 271,282 ****
  	tags=; \
  	here=`pwd`; \
! 	if (etags --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
  	else \
  	  include_option=--include; \
  	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -f $$subdir/TAGS && \
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
--- 314,327 ----
  	tags=; \
  	here=`pwd`; \
! 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
+ 	  empty_fix=.; \
  	else \
  	  include_option=--include; \
+ 	  empty_fix=; \
  	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
***************
*** 288,295 ****
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
! 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	     $$tags $$unique
! 
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
--- 333,341 ----
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
***************
*** 314,330 ****
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- 
- top_distdir = .
- distdir = $(PACKAGE)-$(VERSION)
- 
- am__remove_distdir = \
-   { test ! -d $(distdir) \
-     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-          && rm -fr $(distdir); }; }
- 
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
  
  distdir: $(DISTFILES)
--- 360,363 ----
***************
*** 342,346 ****
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
! 	    $(mkinstalldirs) "$(distdir)$$dir"; \
  	  else \
  	    dir=''; \
--- 375,379 ----
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
  	  else \
  	    dir=''; \
***************
*** 357,369 ****
  	  fi; \
  	done
! 	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d $(distdir)/$$subdir \
! 	    || mkdir $(distdir)/$$subdir \
  	    || exit 1; \
  	    (cd $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$(top_distdir)" \
! 	        distdir=../$(distdir)/$$subdir \
  	        distdir) \
  	      || exit 1; \
--- 390,404 ----
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
  	    (cd $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
  	        distdir) \
  	      || exit 1; \
***************
*** 376,384 ****
  	|| chmod -R a+r $(distdir)
  dist-gzip: distdir
! 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
  
  dist dist-all: distdir
! 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
  
--- 411,436 ----
  	|| chmod -R a+r $(distdir)
  dist-gzip: distdir
! 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! 	$(am__remove_distdir)
! 
! dist-bzip2: distdir
! 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
! 	$(am__remove_distdir)
! 
! dist-tarZ: distdir
! 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
! 	$(am__remove_distdir)
! 
! dist-shar: distdir
! 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
! 	$(am__remove_distdir)
! 
! dist-zip: distdir
! 	-rm -f $(distdir).zip
! 	zip -rq $(distdir).zip $(distdir)
  	$(am__remove_distdir)
  
  dist dist-all: distdir
! 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
  
***************
*** 387,392 ****
  # tarfile.
  distcheck: dist
! 	$(am__remove_distdir)
! 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
  	chmod -R a-w $(distdir); chmod a+w $(distdir)
  	mkdir $(distdir)/_build
--- 439,454 ----
  # tarfile.
  distcheck: dist
! 	case '$(DIST_ARCHIVES)' in \
! 	*.tar.gz*) \
! 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
! 	*.tar.bz2*) \
! 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
! 	*.tar.Z*) \
! 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
! 	*.shar.gz*) \
! 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
! 	*.zip*) \
! 	  unzip $(distdir).zip ;;\
! 	esac
  	chmod -R a-w $(distdir); chmod a+w $(distdir)
  	mkdir $(distdir)/_build
***************
*** 408,412 ****
  	  && chmod -R a-w "$$dc_install_base" \
  	  && ({ \
! 	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
--- 470,474 ----
  	  && chmod -R a-w "$$dc_install_base" \
  	  && ({ \
! 	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
***************
*** 415,424 ****
  	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
  	  && rm -rf "$$dc_destdir" \
! 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! 	  && rm -f $(distdir).tar.gz \
  	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
  	$(am__remove_distdir)
! 	@echo "$(distdir).tar.gz is ready for distribution" | \
! 	  sed 'h;s/./=/g;p;x;p;x'
  distuninstallcheck:
  	@cd $(distuninstallcheck_dir) \
--- 477,487 ----
  	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
  	  && rm -rf "$$dc_destdir" \
! 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
! 	  && rm -rf $(DIST_ARCHIVES) \
  	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
  	$(am__remove_distdir)
! 	@(echo "$(distdir) archives ready for distribution: "; \
! 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
! 	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
  distuninstallcheck:
  	@cd $(distuninstallcheck_dir) \
***************
*** 444,448 ****
  installdirs: installdirs-recursive
  installdirs-am:
- 
  install: install-recursive
  install-exec: install-exec-recursive
--- 507,510 ----
***************
*** 464,468 ****
  
  distclean-generic:
! 	-rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--- 526,530 ----
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
***************
*** 482,485 ****
--- 544,549 ----
  dvi-am:
  
+ html: html-recursive
+ 
  info: info-recursive
  
***************
*** 518,537 ****
  uninstall-info: uninstall-info-recursive
  
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
! 	clean-generic clean-recursive ctags ctags-recursive dist \
! 	dist-all dist-gzip distcheck distclean distclean-generic \
! 	distclean-hdr distclean-recursive distclean-tags distcleancheck \
! 	distdir distuninstallcheck dvi dvi-am dvi-recursive info \
! 	info-am info-recursive install install-am install-data \
! 	install-data-am install-data-recursive install-exec \
! 	install-exec-am install-exec-recursive install-info \
! 	install-info-am install-info-recursive install-man \
! 	install-recursive install-strip installcheck installcheck-am \
! 	installdirs installdirs-am installdirs-recursive \
! 	maintainer-clean maintainer-clean-generic \
! 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
! 	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
! 	ps-recursive tags tags-recursive uninstall uninstall-am \
! 	uninstall-info-am uninstall-info-recursive uninstall-recursive
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 582,599 ----
  uninstall-info: uninstall-info-recursive
  
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
! 	check-am clean clean-generic clean-recursive ctags \
! 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
! 	dist-tarZ dist-zip distcheck distclean distclean-generic \
! 	distclean-hdr distclean-recursive distclean-tags \
! 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
! 	html-am info info-am install install-am install-data \
! 	install-data-am install-exec install-exec-am install-info \
! 	install-info-am install-man install-strip installcheck \
! 	installcheck-am installdirs installdirs-am maintainer-clean \
! 	maintainer-clean-generic maintainer-clean-recursive \
! 	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
! 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
! 	uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/cscope/cscope/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** aclocal.m4	12 Feb 2004 18:14:04 -0000	1.5
--- aclocal.m4	19 Apr 2006 14:30:16 -0000	1.6
***************
*** 1,6 ****
! # generated automatically by aclocal 1.7.9 -*- Autoconf -*-
  
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
[...1266 lines suppressed...]
! 
!   # tar/untar a dummy directory, and stop if the command works
!   rm -rf conftest.dir
!   mkdir conftest.dir
!   echo GrepMe > conftest.dir/file
!   AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
!   rm -rf conftest.dir
!   if test -s conftest.tar; then
!     AM_RUN_LOG([$am__untar <conftest.tar])
!     grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
!   fi
! done
! rm -rf conftest.dir
! 
! AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
! AC_MSG_RESULT([$am_cv_prog_tar_$1])])
! AC_SUBST([am__tar])
! AC_SUBST([am__untar])
! ]) # _AM_PROG_TAR
  

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** configure	6 Dec 2004 14:56:42 -0000	1.25
--- configure	19 Apr 2006 14:30:16 -0000	1.26
***************
*** 1,8 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57.
  #
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,7 ----
  #! /bin/sh
[...3742 lines suppressed...]
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
***************
*** 7168,7175 ****
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
!          X"$as_dir" : 'X\(//\)[^/]' \| \
!          X"$as_dir" : 'X\(//\)$' \| \
!          X"$as_dir" : 'X\(/\)' \| \
!          .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--- 7656,7663 ----
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$as_dir" : 'X\(//\)[^/]' \| \
! 	 X"$as_dir" : 'X\(//\)$' \| \
! 	 X"$as_dir" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

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

Modified Files:
	Makefile.in 
Log Message:
Autoreconf'ed to versions 2.59 / 1.9.6

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in	12 Feb 2004 18:14:05 -0000	1.10
--- Makefile.in	19 Apr 2006 14:30:16 -0000	1.11
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
  # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.9.6 from Makefile.am.
  # @configure_input@
[...1626 lines suppressed...]
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
! 	clean-generic ctags distclean distclean-compile \
! 	distclean-generic distclean-tags distdir dvi dvi-am info \
! 	info-am install install-am install-binPROGRAMS install-data \
! 	install-data-am install-exec install-exec-am install-info \
! 	install-info-am install-man install-strip installcheck \
! 	installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
--- 956,965 ----
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
! 	clean-generic ctags dist-hook distclean distclean-compile \
! 	distclean-generic distclean-tags distdir dvi dvi-am html \
! 	html-am info info-am install install-am install-binPROGRAMS \
! 	install-data install-data-am install-exec install-exec-am \
! 	install-info install-info-am install-man install-strip \
! 	installcheck installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \

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

Modified Files:
	Makefile.in 
Log Message:
Autoreconf'ed to versions 2.59 / 1.9.6

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.in	12 Feb 2004 18:14:05 -0000	1.7
--- Makefile.in	19 Apr 2006 14:30:16 -0000	1.8
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
  # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.9.6 from Makefile.am.
  # @configure_input@
  
! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 22,26 ****
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
- 
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
--- 22,25 ----
***************
*** 36,40 ****
--- 35,56 ----
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ build_triplet = @build@
  host_triplet = @host@
+ LIBOBJDIR =
+ subdir = contrib
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
***************
*** 102,105 ****
--- 118,123 ----
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
  bindir = @bindir@
  build = @build@
***************
*** 124,127 ****
--- 142,146 ----
  localstatedir = @localstatedir@
  mandir = @mandir@
+ mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
***************
*** 131,165 ****
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
  bin_SCRIPTS = ocs
- 
  EXTRA_DIST = ocs README xcscope webcscope
- subdir = contrib
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(bin_SCRIPTS)
- 
- DIST_SOURCES =
- DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  contrib/Makefile
! Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(bindir)
  	@list='$(bin_SCRIPTS)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  if test -f $$d$$p; then \
  	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
! 	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
! 	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
  	  else :; fi; \
  	done
--- 150,196 ----
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  bin_SCRIPTS = ocs
  EXTRA_DIST = ocs README xcscope webcscope
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
! 	@for dep in $?; do \
! 	  case '$(am__configure_deps)' in \
! 	    *$$dep*) \
! 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
! 		&& exit 0; \
! 	      exit 1;; \
! 	  esac; \
! 	done; \
! 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/Makefile'; \
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  contrib/Makefile
! .PRECIOUS: Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! 	@case '$?' in \
! 	  *config.status*) \
! 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
! 	  *) \
! 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
! 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
! 	esac;
! 
! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
! 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
! 
! $(top_srcdir)/configure:  $(am__configure_deps)
! 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
! $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
! 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
! 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
  	@list='$(bin_SCRIPTS)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  if test -f $$d$$p; then \
  	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
! 	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
! 	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
  	  else :; fi; \
  	done
***************
*** 169,174 ****
  	@list='$(bin_SCRIPTS)'; for p in $$list; do \
  	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
! 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! 	  rm -f $(DESTDIR)$(bindir)/$$f; \
  	done
  uninstall-info-am:
--- 200,205 ----
  	@list='$(bin_SCRIPTS)'; for p in $$list; do \
  	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
! 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
! 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
  	done
  uninstall-info-am:
***************
*** 179,186 ****
  CTAGS:
  
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- 
- top_distdir = ..
- distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  
  distdir: $(DISTFILES)
--- 210,213 ----
***************
*** 196,200 ****
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
! 	    $(mkinstalldirs) "$(distdir)$$dir"; \
  	  else \
  	    dir=''; \
--- 223,227 ----
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
  	  else \
  	    dir=''; \
***************
*** 214,220 ****
  check: check-am
  all-am: Makefile $(SCRIPTS)
- 
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(bindir)
  install: install-am
  install-exec: install-exec-am
--- 241,248 ----
  check: check-am
  all-am: Makefile $(SCRIPTS)
  installdirs:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
  install: install-am
  install-exec: install-exec-am
***************
*** 236,240 ****
  
  distclean-generic:
! 	-rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--- 264,268 ----
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
***************
*** 253,256 ****
--- 281,286 ----
  dvi-am:
  
+ html: html-am
+ 
  info: info-am
  
***************
*** 286,296 ****
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
! 	distclean-generic distdir dvi dvi-am info info-am install \
! 	install-am install-binSCRIPTS install-data install-data-am \
! 	install-exec install-exec-am install-info install-info-am \
! 	install-man install-strip installcheck installcheck-am \
! 	installdirs maintainer-clean maintainer-clean-generic \
! 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
! 	uninstall-am uninstall-binSCRIPTS uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 316,327 ----
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
! 	distclean-generic distdir dvi dvi-am html html-am info info-am \
! 	install install-am install-binSCRIPTS install-data \
! 	install-data-am install-exec install-exec-am install-info \
! 	install-info-am install-man install-strip installcheck \
! 	installcheck-am installdirs maintainer-clean \
! 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
! 	pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
! 	uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

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

Modified Files:
	Makefile.in 
Log Message:
Autoreconf'ed to versions 2.59 / 1.9.6

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.in	12 Feb 2004 18:14:05 -0000	1.6
--- Makefile.in	19 Apr 2006 14:30:16 -0000	1.7
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
  # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.9.6 from Makefile.am.
  # @configure_input@
  
! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 14,18 ****
  
  @SET_MAKE@
- 
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
--- 14,17 ----
***************
*** 22,26 ****
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
- 
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
--- 21,24 ----
***************
*** 36,40 ****
--- 34,56 ----
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ build_triplet = @build@
  host_triplet = @host@
+ LIBOBJDIR =
+ subdir = doc
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ man1dir = $(mandir)/man1
+ am__installdirs = "$(DESTDIR)$(man1dir)"
+ NROFF = nroff
+ MANS = $(man_MANS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
***************
*** 102,105 ****
--- 118,123 ----
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
  bindir = @bindir@
  build = @build@
***************
*** 124,127 ****
--- 142,146 ----
  localstatedir = @localstatedir@
  mandir = @mandir@
+ mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
***************
*** 131,161 ****
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
  man_MANS = cscope.1
  EXTRA_DIST = $(man_MANS)
- subdir = doc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
- 
- NROFF = nroff
- MANS = $(man_MANS)
- DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  doc/Makefile
! Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
- 
- man1dir = $(mandir)/man1
  install-man1: $(man1_MANS) $(man_MANS)
  	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
  	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
  	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
--- 150,191 ----
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  man_MANS = cscope.1
  EXTRA_DIST = $(man_MANS)
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
! 	@for dep in $?; do \
! 	  case '$(am__configure_deps)' in \
! 	    *$$dep*) \
! 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
! 		&& exit 0; \
! 	      exit 1;; \
! 	  esac; \
! 	done; \
! 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  doc/Makefile
! .PRECIOUS: Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! 	@case '$?' in \
! 	  *config.status*) \
! 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
! 	  *) \
! 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
! 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
! 	esac;
! 
! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
! 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
! 
! $(top_srcdir)/configure:  $(am__configure_deps)
! 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
! $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
! 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  uninstall-info-am:
  install-man1: $(man1_MANS) $(man_MANS)
  	@$(NORMAL_INSTALL)
! 	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
  	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
  	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
***************
*** 176,181 ****
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
! 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
! 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
  	done
  uninstall-man1:
--- 206,211 ----
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
! 	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
! 	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
  	done
  uninstall-man1:
***************
*** 197,202 ****
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
! 	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
! 	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
  	done
  tags: TAGS
--- 227,232 ----
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
! 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
! 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
  	done
  tags: TAGS
***************
*** 206,213 ****
  CTAGS:
  
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- 
- top_distdir = ..
- distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  
  distdir: $(DISTFILES)
--- 236,239 ----
***************
*** 223,227 ****
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
! 	    $(mkinstalldirs) "$(distdir)$$dir"; \
  	  else \
  	    dir=''; \
--- 249,253 ----
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
  	  else \
  	    dir=''; \
***************
*** 241,247 ****
  check: check-am
  all-am: Makefile $(MANS)
- 
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
  install: install-am
  install-exec: install-exec-am
--- 267,274 ----
  check: check-am
  all-am: Makefile $(MANS)
  installdirs:
! 	for dir in "$(DESTDIR)$(man1dir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
  install: install-am
  install-exec: install-exec-am
***************
*** 263,267 ****
  
  distclean-generic:
! 	-rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--- 290,294 ----
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
***************
*** 280,283 ****
--- 307,312 ----
  dvi-am:
  
+ html: html-am
+ 
  info: info-am
  
***************
*** 315,320 ****
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
! 	distclean-generic distdir dvi dvi-am info info-am install \
! 	install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
  	install-man1 install-strip installcheck installcheck-am \
--- 344,349 ----
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
! 	distclean-generic distdir dvi dvi-am html html-am info info-am \
! 	install install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
  	install-man1 install-strip installcheck installcheck-am \

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

Modified Files:
	dir.c 
Log Message:
Work around Cygwin-1.5.19 silliness --- get rid of d_ino check altogether.

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** dir.c	22 Nov 2005 11:28:55 -0000	1.23
--- dir.c	19 Apr 2006 14:28:57 -0000	1.24
***************
*** 99,104 ****
  	if (vpndirs > 1) {
  		nsrcdirs = vpndirs;
! 	}
! 	else {
  		nsrcdirs = 1;
  	}
--- 99,103 ----
  	if (vpndirs > 1) {
  		nsrcdirs = vpndirs;
! 	} else {
  		nsrcdirs = 1;
  	}
***************
*** 231,236 ****
  			incdirs = mymalloc(mincdirs * sizeof(char *));
  			incnames = mymalloc(mincdirs * sizeof(char *));
! 		}
! 		else if (nincdirs == mincdirs) {
  			mincdirs += DIRINC;
  			incdirs = myrealloc(incdirs, 
--- 230,234 ----
  			incdirs = mymalloc(mincdirs * sizeof(char *));
  			incnames = mymalloc(mincdirs * sizeof(char *));
! 		} else if (nincdirs == mincdirs) {
  			mincdirs += DIRINC;
  			incdirs = myrealloc(incdirs, 
***************
*** 285,290 ****
  				if ((s = inviewpath(file)) != NULL) {
  					addsrcfile(s);
! 				}
! 				else {
  					(void) fprintf(stderr, "cscope: cannot find file %s\n",
  						       file);
--- 283,287 ----
  				if ((s = inviewpath(file)) != NULL) {
  					addsrcfile(s);
! 				} else {
  					(void) fprintf(stderr, "cscope: cannot find file %s\n",
  						       file);
***************
*** 505,519 ****
                                              && S_ISDIR(buf.st_mode) ) {
  						scan_dir(path, recurse_dir);
! 					}
! 					else if (
! #ifdef __DJGPP__ /* FIXME: should test for feature, not platform */
! 						 1 /* DJGPP doesn't have this field in dirent */
! #else
! 						 entry->d_ino != 0
! #endif
! 						 && issrcfile(path)
! 						 && infilelist(path) == NO) {
! 						if(access(path,R_OK) == 0)
! 							addsrcfile(path);
  					}
  				}
--- 502,509 ----
                                              && S_ISDIR(buf.st_mode) ) {
  						scan_dir(path, recurse_dir);
! 					} else if (issrcfile(path)
! 						   && infilelist(path) == NO
! 						   && access(path, R_OK) == 0)
! 						addsrcfile(path);
  					}
  				}
***************
*** 607,612 ****
  	if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
  		addsrcfile(s);
! 	}
! 	else {
  		int file_len = strlen(file);
  
--- 597,601 ----
  	if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
  		addsrcfile(s);
! 	} else {
  		int file_len = strlen(file);
  
***************
*** 712,719 ****
  			free (srcfiles[--nsrcfiles]);
  		}
! 	}
! 	else {
  		/* for '-d' option free the string space block */
! 	    if (nsrcfiles > 0)		/* protect against empty list */
  			free (srcfiles[0]);
  		nsrcfiles = 0;
--- 701,708 ----
  			free (srcfiles[--nsrcfiles]);
  		}
! 	} else {
  		/* for '-d' option free the string space block */
! 		/* protect against empty list */
! 		if (nsrcfiles > 0)
  			free (srcfiles[0]);
  		nsrcfiles = 0;