cscope-cvs Mailing List for cscope

Update of /cvsroot/cscope/cscope/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19260/src

Modified Files:
	version.h 
Log Message:
Version number to 15.7a

Index: version.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/version.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** version.h	5 Jul 2001 14:31:00 -0000	1.8
--- version.h	30 Apr 2009 22:16:28 -0000	1.9
***************
*** 42,47 ****
  #define CSCOPE_VERSION_H
  
! #define	FILEVERSION	16	/* Initial Open Source and Linux Port */
! #define	FIXVERSION	".0a"	/* feature and bug fix version */
  
  #endif /* CSCOPE_VERSION_H */
--- 42,47 ----
  #define CSCOPE_VERSION_H
  
! #define	FILEVERSION	15	/* Initial Open Source and Linux Port */
! #define	FIXVERSION	".7a"	/* feature and bug fix version */
  
  #endif /* CSCOPE_VERSION_H */

Update of /cvsroot/cscope/cscope
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19260

Modified Files:
	ChangeLog configure configure.in 
Log Message:
Version number to 15.7a

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -r1.178 -r1.179
*** ChangeLog	10 Apr 2009 13:39:22 -0000	1.178
--- ChangeLog	30 Apr 2009 22:16:28 -0000	1.179
***************
*** 1,2 ****
--- 1,11 ----
+ 2009-04-30  Hans-Bernhard Broeker  <br...@ph...>
+ 
+ 	* src/version.h (FILEVERSION, FIXVERSION): Version number changed
+ 	to 15.7a.
+ 
+ 	* configure.in: Version number changed to 15.7a.
+ 
+ 	* configure (all): Regenerated.
+ 
  2009-04-10  Hans-Bernhard Broeker  <br...@ph...>
  

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** configure	10 Apr 2009 13:39:22 -0000	1.31
--- configure	30 Apr 2009 22:16:28 -0000	1.32
***************
*** 2079,2083 ****
  # Define the identity of the package.
   PACKAGE=cscope
!  VERSION=16.0a
  
  
--- 2079,2083 ----
  # Define the identity of the package.
   PACKAGE=cscope
!  VERSION=15.7a
  
  

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** configure.in	10 Apr 2009 13:39:23 -0000	1.35
--- configure.in	30 Apr 2009 22:16:28 -0000	1.36
***************
*** 2,6 ****
  AC_INIT
  AC_CONFIG_SRCDIR([src/crossref.c])
! AM_INIT_AUTOMAKE(cscope, 16.0a)
  AC_CONFIG_HEADERS([config.h:config.h.in])
  AC_PREREQ(2.59)
--- 2,6 ----
  AC_INIT
  AC_CONFIG_SRCDIR([src/crossref.c])
! AM_INIT_AUTOMAKE(cscope, 15.7a)
  AC_CONFIG_HEADERS([config.h:config.h.in])
  AC_PREREQ(2.59)

Update of /cvsroot/cscope/cscope/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099/src

Modified Files:
	build.c command.c dir.c display.c edit.c exec.c find.c 
	global.h main.c Makefile.am Makefile.in vpaccess.c vpfopen.c 
	vpopen.c 
Added Files:
	snprintf.c 
Log Message:
Replace all usage of (v)sprintf by (v)snprintf.
Supply and use optional replacement snprintf on systems that don't have it.

--- NEW FILE ---
/* $Id: snprintf.c,v 1.1 2009/04/10 13:39:23 broeker Exp $ */

/*
 * Copyright (c) 1995 Patrick Powell.
 *
 * This code is based on code written by Patrick Powell <pap...@as...>.
 * It may be used for any purpose as long as this notice remains intact on all
 * source code distributions.
 */

/*
 * Copyright (c) 2008 Holger Weiss.
 *
 * This version of the code is maintained by Holger Weiss <ho...@jh...>.
 * My changes to the code may freely be used, modified and/or redistributed for
 * any purpose.  It would be nice if additions and fixes to this file (including
 * trivial code cleanups) would be sent back in order to let me include them in
 * the version available at <." rel="nofollow">http://www.jhweiss.de/software/snprintf.html>.
 * However, this is not a requirement for using or redistributing (possibly
[...2058 lines suppressed...]
#if !OS_SYSV	/* SysV uses a different format than we do. */
	TEST(pointer_fmt, pointer_val);
#endif	/* !OS_SYSV */
	(void)printf("Result: %d out of %d tests failed.\n", failed, num);

	(void)fputs("Checking how many digits we support: ", stdout);
	for (i = 0; i < 100; i++) {
		value = pow(10, i) * digits;
		(void)sprintf(buf1, "%.1f", value);
		(void)snprintf(buf2, sizeof(buf2), "%.1f", value);
		if (strcmp(buf1, buf2) != 0) {
			(void)printf("apparently %d.\n", i);
			break;
		}
	}
	return (failed == 0) ? 0 : 1;
}
#endif	/* TEST_SNPRINTF */

/* vim: set joinspaces textwidth=80: */

Index: build.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/build.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** build.c	12 Mar 2008 22:40:47 -0000	1.14
--- build.c	10 Apr 2009 13:39:23 -0000	1.15
***************
*** 224,228 ****
  	strcpy(newdir, "$HOME");
      } else if (strncmp(currentdir, home, strlen(home)) == 0) {
! 	sprintf(newdir, "$HOME%s", currentdir + strlen(home));
      }
      /* sort the source file names (needed for rebuilding) */
--- 224,228 ----
  	strcpy(newdir, "$HOME");
      } else if (strncmp(currentdir, home, strlen(home)) == 0) {
! 	snprintf(newdir, sizeof(newdir), "$HOME%s", currentdir + strlen(home));
      }
      /* sort the source file names (needed for rebuilding) */
***************
*** 457,461 ****
  	fstat(fileno(postings), &statstruct);
  	fclose(postings);
! 	sprintf(sortcommand, "env LC_ALL=C sort -T %s %s", tmpdir, temp1);
  	if ((postings = mypopen(sortcommand, "r")) == NULL) {
  	    fprintf(stderr, "cscope: cannot open pipe to sort command\n");
--- 457,461 ----
  	fstat(fileno(postings), &statstruct);
  	fclose(postings);
! 	snprintf(sortcommand, sizeof(sortcommand), "env LC_ALL=C sort -T %s %s", tmpdir, temp1);
  	if ((postings = mypopen(sortcommand, "r")) == NULL) {
  	    fprintf(stderr, "cscope: cannot open pipe to sort command\n");

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** command.c	20 Aug 2006 15:00:33 -0000	1.32
--- command.c	10 Apr 2009 13:39:23 -0000	1.33
***************
*** 740,744 ****
  		/* make sure it can be changed */
  		if (access(newfile, WRITE) != 0) {
! 		    sprintf(msg, "Cannot write to file %s", newfile);
  		    postmsg(msg);
  		    anymarked = NO;
--- 740,744 ----
  		/* make sure it can be changed */
  		if (access(newfile, WRITE) != 0) {
! 		    snprintf(msg, sizeof(msg), "Cannot write to file %s", newfile);
  		    postmsg(msg);
  		    anymarked = NO;

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** dir.c	14 Feb 2008 12:39:37 -0000	1.30
--- dir.c	10 Apr 2009 13:39:23 -0000	1.31
***************
*** 141,145 ****
  	    /* 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);
--- 141,145 ----
  	    /* compute its path from higher view path source dirs */
  	    for (i = 1; i < nvpsrcdirs; ++i) {
! 		snprintf(path, sizeof(path), "%.*s/%s",
  			PATHLEN - 2 - dir_len,
  			srcdirs[i], dir);
***************
*** 209,213 ****
  	    /* 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);
--- 209,213 ----
  	    /* compute its path from higher view path source dirs */
  	    for (i = 1; i < nvpsrcdirs; ++i) {
! 		snprintf(path, sizeof(path), "%.*s/%s", 
  			PATHLEN - 2 - dir_len,
  			srcdirs[i], dir);
***************
*** 496,500 ****
  				struct stat buf;
  
! 				sprintf(path,"%s/%.*s", adir,
  					PATHLEN - 2 - adir_len,
  					entry->d_name);
--- 496,500 ----
  				struct stat buf;
  
! 				snprintf(path, sizeof(path), "%s/%.*s", adir,
  					PATHLEN - 2 - adir_len,
  					entry->d_name);
***************
*** 608,612 ****
  	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);
--- 608,612 ----
  	for (i = 0; i < nincdirs; ++i) {
  	    /* don't include the file from two directories */
! 	    snprintf(name, sizeof(name), "%.*s/%s",
  		    PATHLEN - 2 - file_len, incnames[i],
  		    file);
***************
*** 615,619 ****
  	    }
  	    /* make sure it exists and is readable */
! 	    sprintf(path, "%.*s/%s",
  		    PATHLEN - 2 - file_len, incdirs[i],
  		    file);
--- 615,619 ----
  	    }
  	    /* make sure it exists and is readable */
! 	    snprintf(path, sizeof(path), "%.*s/%s",
  		    PATHLEN - 2 - file_len, incdirs[i],
  		    file);
***************
*** 679,683 ****
  	/* 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);
--- 679,683 ----
  	/* compute its path from higher view path source dirs */
  	for (i = 1; i < nvpsrcdirs; ++i) {
! 	    snprintf(path, sizeof(path), "%.*s/%s",
  		    PATHLEN - 2 - file_len, srcdirs[i],
  		    file);

Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** display.c	20 Aug 2006 15:00:34 -0000	1.29
--- display.c	10 Apr 2009 13:39:23 -0000	1.30
***************
*** 479,496 ****
  	if ((c = getc(refsfound)) == EOF) {
  		if (findresult != NULL) {
! 			(void) sprintf(lastmsg, "Egrep %s in this pattern: %s", 
  				       findresult, Pattern);
  		} else if (rc == NOTSYMBOL) {
! 			(void) sprintf(lastmsg, "This is not a C symbol: %s", 
  				       Pattern);
  		} else if (rc == REGCMPERROR) {
! 			(void) sprintf(lastmsg, "Error in this regcomp(3) regular expression: %s", 
  				       Pattern);
  			
  		} else if (funcexist == NO) {
! 			(void) sprintf(lastmsg, "Function definition does not exist: %s", 
  				       Pattern);
  		} else {
! 			(void) sprintf(lastmsg, "Could not find the %s: %s", 
  				       fields[field].text2, Pattern);
  		}
--- 479,496 ----
  	if ((c = getc(refsfound)) == EOF) {
  		if (findresult != NULL) {
! 			(void) snprintf(lastmsg, sizeof(lastmsg), "Egrep %s in this pattern: %s", 
  				       findresult, Pattern);
  		} else if (rc == NOTSYMBOL) {
! 			(void) snprintf(lastmsg, sizeof(lastmsg), "This is not a C symbol: %s", 
  				       Pattern);
  		} else if (rc == REGCMPERROR) {
! 			(void) snprintf(lastmsg, sizeof(lastmsg), "Error in this regcomp(3) regular expression: %s", 
  				       Pattern);
  			
  		} else if (funcexist == NO) {
! 			(void) snprintf(lastmsg, sizeof(lastmsg), "Function definition does not exist: %s", 
  				       Pattern);
  		} else {
! 			(void) snprintf(lastmsg, sizeof(lastmsg), "Could not find the %s: %s", 
  				       fields[field].text2, Pattern);
  		}
***************
*** 528,535 ****
  			clrtoeol();
  			addstr(what);
! 			sprintf(msg, "%ld", current);
  			move(MSGLINE, (COLS / 2) - (strlen(msg) / 2));
  			addstr(msg);
! 			sprintf(msg, "%ld", max);
  			move(MSGLINE, COLS - strlen(msg));
  			addstr(msg);
--- 528,535 ----
  			clrtoeol();
  			addstr(what);
! 			snprintf(msg, sizeof(msg), "%ld", current);
  			move(MSGLINE, (COLS / 2) - (strlen(msg) / 2));
  			addstr(msg);
! 			snprintf(msg, sizeof(msg), "%ld", max);
  			move(MSGLINE, COLS - strlen(msg));
  			addstr(msg);
***************
*** 538,542 ****
  		else if (verbosemode == YES)
  		{
! 			sprintf(msg, "> %s %ld of %ld", what, current, max);
  		}
  
--- 538,542 ----
  		else if (verbosemode == YES)
  		{
! 			snprintf(msg, sizeof(msg), "> %s %ld of %ld", what, current, max);
  		}
  
***************
*** 576,580 ****
  	}
  #endif
! 	(void) sprintf(msg, "%s: %s", text, s);
  	postmsg(msg);
  }
--- 576,580 ----
  	}
  #endif
! 	(void) snprintf(msg, sizeof(msg), "%s: %s", text, s);
  	postmsg(msg);
  }
***************
*** 648,656 ****
  	(void) fputc('\n', stderr);
      } else {
- #if HAVE_VSNPRINTF
          vsnprintf(errbuf, sizeof(errbuf), msg, ap);
- #else
-         vsprintf(errbuf, msg, ap);
- #endif
          postmsg2(errbuf); 
      }
--- 648,652 ----
***************
*** 665,673 ****
  
  	va_start(ap, msg);
- #if HAVE_VSNPRINTF
  	vsnprintf(errbuf, sizeof(errbuf), msg, ap);
- #else
- 	vsprintf(errbuf, msg, ap);
- #endif
  	/* restore the terminal to its original mode */
  	if (incurses == YES) {
--- 661,665 ----

Index: edit.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/edit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** edit.c	20 Aug 2006 15:00:34 -0000	1.6
--- edit.c	10 Apr 2009 13:39:23 -0000	1.7
***************
*** 106,112 ****
  
  	file = filepath(file);
! 	(void) sprintf(msg, "%s +%s %s", mybasename(editor), linenum, file);
  	postmsg(msg);
! 	(void) sprintf(plusnum, lineflag, linenum);
  	/* if this is the more or page commands */
  	if (strcmp(s = mybasename(editor), "more") == 0 || strcmp(s, "page") == 0) {
--- 106,112 ----
  
  	file = filepath(file);
! 	(void) snprintf(msg, sizeof(msg), "%s +%s %s", mybasename(editor), linenum, file);
  	postmsg(msg);
! 	(void) snprintf(plusnum, sizeof(plusnum), lineflag, linenum);
  	/* if this is the more or page commands */
  	if (strcmp(s = mybasename(editor), "more") == 0 || strcmp(s, "page") == 0) {
***************
*** 133,137 ****
  	
  	if (prependpath != NULL && *file != '/') {
! 		(void) sprintf(path, "%s/%s", prependpath, file);
  		file = path;
  	}
--- 133,137 ----
  	
  	if (prependpath != NULL && *file != '/') {
! 		(void) snprintf(path, sizeof(path), "%s/%s", prependpath, file);
  		file = path;
  	}

Index: exec.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/exec.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** exec.c	11 Apr 2008 11:23:55 -0000	1.11
--- exec.c	10 Apr 2009 13:39:23 -0000	1.12
***************
*** 124,128 ****
      /* execute the program or shell script */
      execvp(a, args);	/* returns only on failure */
!     sprintf(msg, "\nCannot exec %s", a);
      perror(msg);		/* display the reason */
      askforreturn();		/* wait until the user sees the message */
--- 124,128 ----
      /* execute the program or shell script */
      execvp(a, args);	/* returns only on failure */
!     snprintf(msg, sizeof(msg), "\nCannot exec %s", a);
      perror(msg);		/* display the reason */
      askforreturn();		/* wait until the user sees the message */

Index: find.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/find.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** find.c	20 Aug 2006 19:15:54 -0000	1.20
--- find.c	10 Apr 2009 13:39:23 -0000	1.21
***************
*** 674,678 ****
  		/* note: regcomp doesn't recognize ^*keypad$ as a syntax error
  		         unless it is given as a single arg */
! 		(void) sprintf(buf, "^%s$", s);
  		if (regcomp (&regexp, buf, REG_EXTENDED | REG_NOSUB) != 0) {
  			return(REGCMPERROR);
--- 674,678 ----
  		/* note: regcomp doesn't recognize ^*keypad$ as a syntax error
  		         unless it is given as a single arg */
! 		(void) snprintf(buf, sizeof(buf), "^%s$", s);
  		if (regcomp (&regexp, buf, REG_EXTENDED | REG_NOSUB) != 0) {
  			return(REGCMPERROR);

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** global.h	30 Jun 2008 21:16:02 -0000	1.36
--- global.h	10 Apr 2009 13:39:23 -0000	1.37
***************
*** 95,98 ****
--- 95,114 ----
  #endif
  
+ #if HAVE_STDARG_H
+ #include <stdarg.h>
+ #if !HAVE_VSNPRINTF
+ int rpl_vsnprintf(char *, size_t, const char *, va_list);
+ #endif
+ #if !HAVE_SNPRINTF
+ int rpl_snprintf(char *, size_t, const char *, ...);
+ #endif
+ #if !HAVE_VASPRINTF
+ int rpl_vasprintf(char **, const char *, va_list);
+ #endif
+ #if !HAVE_ASPRINTF
+ int rpl_asprintf(char **, const char *, ...);
+ #endif
+ #endif	/* HAVE_STDARG_H */
+ 
  /* FIXME: this testing for platforms is foolish. Stop it! */
  #if BSD

Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** main.c	11 Apr 2008 11:23:55 -0000	1.45
--- main.c	10 Apr 2009 13:39:23 -0000	1.46
***************
*** 356,360 ****
      orig_umask = umask(S_IRWXG|S_IRWXO);
      pid = getpid();
!     sprintf(tempdirpv, "%s/cscope.%d", tmpdir, pid);
      if(mkdir(tempdirpv,S_IRWXU)) {
  	fprintf(stderr, "\
--- 356,360 ----
      orig_umask = umask(S_IRWXG|S_IRWXO);
      pid = getpid();
!     snprintf(tempdirpv, sizeof(tempdirpv), "%s/cscope.%d", tmpdir, pid);
      if(mkdir(tempdirpv,S_IRWXU)) {
  	fprintf(stderr, "\
***************
*** 365,370 ****
      umask(orig_umask);
  
!     sprintf(temp1, "%s/cscope.1", tempdirpv);
!     sprintf(temp2, "%s/cscope.2", tempdirpv);
  
      /* if running in the foreground */
--- 365,370 ----
      umask(orig_umask);
  
!     snprintf(temp1, sizeof(temp1), "%s/cscope.1", tempdirpv);
!     snprintf(temp2, sizeof(temp2), "%s/cscope.2", tempdirpv);
  
      /* if running in the foreground */
***************
*** 389,398 ****
  	 * the home directory
  	 */
! 	sprintf(path, "%s/%s", home, reffile);
  	if (isuptodate == NO || access(path, READ) == 0) {
  	    reffile = my_strdup(path);
! 	    sprintf(path, "%s/%s", home, invname);
  	    invname = my_strdup(path);
! 	    sprintf(path, "%s/%s", home, invpost);
  	    invpost = my_strdup(path);
  	}
--- 389,398 ----
  	 * the home directory
  	 */
! 	snprintf(path, sizeof(path), "%s/%s", home, reffile);
  	if (isuptodate == NO || access(path, READ) == 0) {
  	    reffile = my_strdup(path);
! 	    snprintf(path, sizeof(path), "%s/%s", home, invname);
  	    invname = my_strdup(path);
! 	    snprintf(path, sizeof(path), "%s/%s", home, invpost);
  	    invpost = my_strdup(path);
  	}
***************
*** 735,754 ****
  cannotwrite(char *file)
  {
- #if HAVE_SNPRINTF
      char	msg[MSGLEN + 1];
  
      snprintf(msg, sizeof(msg), "Removed file %s because write failed", file);
- #else
-     char *msg = mymalloc(50 + strlen(file));
- 
-     sprintf(msg, "Removed file %s because write failed", file);
- #endif
  
      myperror(msg);	/* display the reason */
  
- #if !HAVE_SNPRINTF
-     free(msg);
- #endif
- 
      unlink(file);
      myexit(1);	/* calls exit(2), which closes files */
--- 735,744 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Makefile.am	30 Sep 2006 20:29:14 -0000	1.12
--- Makefile.am	10 Apr 2009 13:39:23 -0000	1.13
***************
*** 30,34 ****
  LEXLIB = @LEXLIB@
  
! cscope_LDADD =  $(CURSES_LIBS) $(LEXLIB)
  
  AM_CPPFLAGS = $(CURSES_INCLUDEDIR)
--- 30,34 ----
  LEXLIB = @LEXLIB@
  
! cscope_LDADD =  $(CURSES_LIBS) $(LEXLIB) $(LIBOBJS)
  
  AM_CPPFLAGS = $(CURSES_INCLUDEDIR)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Makefile.in	30 Jun 2008 21:36:48 -0000	1.15
--- Makefile.in	10 Apr 2009 13:39:23 -0000	1.16
***************
*** 42,48 ****
  subdir = src
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in egrep.c \
! 	fscanner.c scanner.c
  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)
--- 42,49 ----
  subdir = src
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in egrep.c \
! 	fscanner.c scanner.c snprintf.c
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
! 	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
***************
*** 73,77 ****
  cscope_OBJECTS = $(am_cscope_OBJECTS)
  am__DEPENDENCIES_1 =
! cscope_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am__gscope_SOURCES_DIST = gscope.c fscanner.l scanner.l egrep.y \
  	alloc.c alloc.h basename.c build.c build.h command.c compath.c \
--- 74,80 ----
  cscope_OBJECTS = $(am_cscope_OBJECTS)
  am__DEPENDENCIES_1 =
! am__DEPENDENCIES_2 = @LIBOBJS@
! cscope_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
! 	$(am__DEPENDENCIES_2)
  am__gscope_SOURCES_DIST = gscope.c fscanner.l scanner.l egrep.y \
  	alloc.c alloc.h basename.c build.c build.h command.c compath.c \
***************
*** 236,240 ****
  
  EXTRA_cscope_SOURCES = scanner.l fscanner.l
! cscope_LDADD = $(CURSES_LIBS) $(LEXLIB)
  AM_CPPFLAGS = $(CURSES_INCLUDEDIR)
  CLEANFILES = scanner.c fscanner.c egrep.c
--- 239,243 ----
  
  EXTRA_cscope_SOURCES = scanner.l fscanner.l
! cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) $(LIBOBJS)
  AM_CPPFLAGS = $(CURSES_INCLUDEDIR)
  CLEANFILES = scanner.c fscanner.c egrep.c
***************
*** 317,320 ****
--- 320,324 ----
  	-rm -f *.tab.c
  
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@
***************
*** 917,921 ****
  
  distclean: distclean-am
! 	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
--- 921,925 ----
  
  distclean: distclean-am
! 	-rm -rf $(DEPDIR) ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
***************
*** 943,947 ****
  
  maintainer-clean: maintainer-clean-am
! 	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-generic
--- 947,951 ----
  
  maintainer-clean: maintainer-clean-am
! 	-rm -rf $(DEPDIR) ./$(DEPDIR)
  	-rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-generic

Index: vpaccess.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vpaccess.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** vpaccess.c	3 May 2000 22:02:10 -0000	1.2
--- vpaccess.c	10 Apr 2009 13:39:23 -0000	1.3
***************
*** 50,54 ****
  		vpinit(NULL);
  		for (i = 1; i < vpndirs; i++) {
! 			(void) sprintf(buf, "%s/%s", vpdirs[i], path);
  			if ((returncode = access(buf, amode)) != -1) {
  				break;
--- 50,54 ----
  		vpinit(NULL);
  		for (i = 1; i < vpndirs; i++) {
! 			(void) snprintf(buf, sizeof(buf), "%s/%s", vpdirs[i], path);
  			if ((returncode = access(buf, amode)) != -1) {
  				break;

Index: vpfopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vpfopen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** vpfopen.c	27 Mar 2001 14:09:19 -0000	1.3
--- vpfopen.c	10 Apr 2009 13:39:23 -0000	1.4
***************
*** 54,58 ****
  		vpinit(NULL);
  		for (i = 1; i < vpndirs; i++) {
! 			(void) sprintf(buf, "%s/%s", vpdirs[i], filename);
  			if ((returncode = myfopen(buf, type)) != NULL) {
  				break;
--- 54,58 ----
  		vpinit(NULL);
  		for (i = 1; i < vpndirs; i++) {
! 			(void) snprintf(buf, sizeof(buf), "%s/%s", vpdirs[i], filename);
  			if ((returncode = myfopen(buf, type)) != NULL) {
  				break;

Index: vpopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vpopen.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** vpopen.c	28 Jul 2002 15:40:07 -0000	1.4
--- vpopen.c	10 Apr 2009 13:39:23 -0000	1.5
***************
*** 53,57 ****
  		vpinit(NULL);
  		for (i = 1; i < vpndirs; i++) {
! 			(void) sprintf(buf, "%s/%s", vpdirs[i], path);
  			if ((returncode = myopen(buf, oflag, 0666)) != -1) {
  				break;
--- 53,57 ----
  		vpinit(NULL);
  		for (i = 1; i < vpndirs; i++) {
! 			(void) snprintf(buf, sizeof(buf), "%s/%s", vpdirs[i], path);
  			if ((returncode = myopen(buf, oflag, 0666)) != -1) {
  				break;

Update of /cvsroot/cscope/cscope
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099

Modified Files:
	aclocal.m4 ChangeLog config.h.in configure configure.in 
	Makefile.in 
Added Files:
	acinclude.m4 
Log Message:
Replace all usage of (v)sprintf by (v)snprintf.
Supply and use optional replacement snprintf on systems that don't have it.

--- NEW FILE ---
# $Id: acinclude.m4,v 1.1 2009/04/10 13:39:22 broeker Exp $

# Copyright (c) 2008 Holger Weiss <ho...@jh...>.
#
# This code may freely be used, modified and/or redistributed for any purpose.
# It would be nice if additions and fixes to this file (including trivial code
# cleanups) would be sent back in order to let me include them in the version
# available at <." rel="nofollow">http://www.jhweiss.de/software/snprintf.html>.  However, this is
# not a requirement for using or redistributing (possibly modified) versions of
# this file, nor is leaving this notice intact mandatory.

# HW_HEADER_STDARG_H
# ------------------
# Define HAVE_STDARG_H to 1 if <stdarg.h> is available.
AC_DEFUN([HW_HEADER_STDARG_H],
[
  AC_PREREQ([2.60])dnl Older releases should work if AC_CHECK_HEADERS is used.
  AC_CHECK_HEADERS_ONCE([stdarg.h])
])# HW_HEADER_STDARG_H

# HW_HEADER_VARARGS_H
# -------------------
# Define HAVE_VARARGS_H to 1 if <varargs.h> is available.
AC_DEFUN([HW_HEADER_VARARGS_H],
[
  AC_PREREQ([2.60])dnl Older releases should work if AC_CHECK_HEADERS is used.
  AC_CHECK_HEADERS_ONCE([varargs.h])
])# HW_HEADER_VARARGS_H

# HW_FUNC_VA_COPY
# ---------------
# Set $hw_cv_func_va_copy to "yes" or "no".  Define HAVE_VA_COPY to 1 if
# $hw_cv_func_va_copy is set to "yes".  Note that it's "unspecified whether
# va_copy and va_end are macros or identifiers declared with external linkage."
# (C99: 7.15.1, 1)  Therefore, the presence of va_copy(3) cannot simply "be
# tested with #ifdef", as suggested by the Autoconf manual (5.5.1).
AC_DEFUN([HW_FUNC_VA_COPY],
[
  AC_REQUIRE([HW_HEADER_STDARG_H])dnl Our check evaluates HAVE_STDARG_H.
  AC_REQUIRE([HW_HEADER_VARARGS_H])dnl Our check evaluates HAVE_VARARGS_H.
  AC_CACHE_CHECK([for va_copy],
    [hw_cv_func_va_copy],
    [AC_RUN_IFELSE(
      [AC_LANG_PROGRAM(
        [[#if HAVE_STDARG_H
        #include <stdarg.h>
        #elif HAVE_VARARGS_H
        #include <varargs.h>
        #endif]],
        [[va_list ap, aq; va_copy(aq, ap);]])],
      [hw_cv_func_va_copy=yes],
      [hw_cv_func_va_copy=no],
      [hw_cv_func_va_copy=no])])
  AS_IF([test "$hw_cv_func_va_copy" = yes],
    [AC_DEFINE([HAVE_VA_COPY], [1],
      [Define to 1 if you have the `va_copy' function or macro.])])
])# HW_FUNC_VA_COPY

# HW_FUNC___VA_COPY
# -----------------
# Set $hw_cv_func___va_copy to "yes" or "no".  Define HAVE___VA_COPY to 1 if
# $hw_cv_func___va_copy is set to "yes".
AC_DEFUN([HW_FUNC___VA_COPY],
[
  AC_REQUIRE([HW_HEADER_STDARG_H])dnl Our check evaluates HAVE_STDARG_H.
  AC_REQUIRE([HW_HEADER_VARARGS_H])dnl Our check evaluates HAVE_VARARGS_H.
  AC_CACHE_CHECK([for __va_copy],
    [hw_cv_func___va_copy],
    [AC_RUN_IFELSE(
      [AC_LANG_PROGRAM(
        [[#if HAVE_STDARG_H
        #include <stdarg.h>
        #elif HAVE_VARARGS_H
        #include <varargs.h>
        #endif]],
        [[va_list ap, aq; __va_copy(aq, ap);]])],
      [hw_cv_func___va_copy=yes],
      [hw_cv_func___va_copy=no],
      [hw_cv_func___va_copy=no])])
  AS_IF([test "$hw_cv_func___va_copy" = yes],
    [AC_DEFINE([HAVE___VA_COPY], [1],
      [Define to 1 if you have the `__va_copy' function or macro.])])
])# HW_FUNC___VA_COPY

# HW_FUNC_VSNPRINTF
# -----------------
# Set $hw_cv_func_vsnprintf and $hw_cv_func_vsnprintf_c99 to "yes" or "no",
# respectively.  Define HAVE_VSNPRINTF to 1 only if $hw_cv_func_vsnprintf_c99
# is set to "yes".  Otherwise, define vsnprintf to rpl_vsnprintf and make sure
# the replacement function will be built.
AC_DEFUN([HW_FUNC_VSNPRINTF],
[
  AC_PREREQ([2.60])dnl 2.59 should work if some AC_TYPE_* macros are replaced.
  AC_REQUIRE([HW_HEADER_STDARG_H])dnl Our check evaluates HAVE_STDARG_H.
  AC_CHECK_FUNC([vsnprintf],
    [hw_cv_func_vsnprintf=yes],
    [hw_cv_func_vsnprintf=no])
  AS_IF([test "$hw_cv_func_vsnprintf" = yes],
    [AC_CACHE_CHECK([whether vsnprintf is C99 compliant],
      [hw_cv_func_vsnprintf_c99],
      [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
          [[#if HAVE_STDARG_H
          #include <stdarg.h>
          #endif
          #include <stdio.h>
          static int testprintf(char *buf, size_t size, const char *format, ...)
          {
            int result;
            va_list ap;
            va_start(ap, format);
            result = vsnprintf(buf, size, format, ap);
            va_end(ap);
            return result;
          }]],
          [[char buf[43];
          if (testprintf(buf, 4, "The answer is %27.2g.", 42.0) != 42 ||
              testprintf(buf, 0, "No, it's %32zu.", (size_t)42) != 42 ||
              buf[0] != 'T' || buf[3] != '\0')
            return 1;]])],
        [hw_cv_func_vsnprintf_c99=yes],
        [hw_cv_func_vsnprintf_c99=no],
        [hw_cv_func_vsnprintf_c99=no])])],
    [hw_cv_func_snprintf_c99=no])
  AS_IF([test "$hw_cv_func_vsnprintf_c99" = yes],
    [AC_DEFINE([HAVE_VSNPRINTF], [1],
      [Define to 1 if you have a C99 compliant `vsnprintf' function.])],
    [AC_DEFINE([vsnprintf], [rpl_vsnprintf],
      [Define to rpl_vsnprintf if the replacement function should be used.])
    AC_CHECK_HEADERS([inttypes.h locale.h stddef.h stdint.h])
    AC_CHECK_MEMBERS([struct lconv.decimal_point, struct lconv.thousands_sep],
      [], [], [#include <locale.h>])
    AC_TYPE_LONG_DOUBLE
    AC_TYPE_LONG_LONG_INT
    AC_TYPE_UNSIGNED_LONG_LONG_INT
    AC_TYPE_SIZE_T
    AC_TYPE_INTMAX_T
    AC_TYPE_UINTMAX_T
    AC_TYPE_UINTPTR_T
    AC_CHECK_TYPES([ptrdiff_t])
    AC_CHECK_FUNCS([localeconv])
    _HW_FUNC_XPRINTF_REPLACE])
])# HW_FUNC_VSNPRINTF

# HW_FUNC_SNPRINTF
# ----------------
# Set $hw_cv_func_snprintf and $hw_cv_func_snprintf_c99 to "yes" or "no",
# respectively.  Define HAVE_SNPRINTF to 1 only if $hw_cv_func_snprintf_c99
# is set to "yes".  Otherwise, define snprintf to rpl_snprintf and make sure
# the replacement function will be built.
AC_DEFUN([HW_FUNC_SNPRINTF],
[
  AC_REQUIRE([HW_FUNC_VSNPRINTF])dnl Our snprintf(3) calls vsnprintf(3).
  AC_CHECK_FUNC([snprintf],
    [hw_cv_func_snprintf=yes],
    [hw_cv_func_snprintf=no])
  AS_IF([test "$hw_cv_func_snprintf" = yes],
    [AC_CACHE_CHECK([whether snprintf is C99 compliant],
      [hw_cv_func_snprintf_c99],
      [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM([[#include <stdio.h>]],
          [[char buf[43];
          if (snprintf(buf, 4, "The answer is %27.2g.", 42.0) != 42 ||
              snprintf(buf, 0, "No, it's %32zu.", (size_t)42) != 42 ||
              buf[0] != 'T' || buf[3] != '\0')
            return 1;]])],
        [hw_cv_func_snprintf_c99=yes],
        [hw_cv_func_snprintf_c99=no],
        [hw_cv_func_snprintf_c99=no])])],
    [hw_cv_func_snprintf_c99=no])
  AS_IF([test "$hw_cv_func_snprintf_c99" = yes],
    [AC_DEFINE([HAVE_SNPRINTF], [1],
      [Define to 1 if you have a C99 compliant `snprintf' function.])],
    [AC_DEFINE([snprintf], [rpl_snprintf],
      [Define to rpl_snprintf if the replacement function should be used.])
    _HW_FUNC_XPRINTF_REPLACE])
])# HW_FUNC_SNPRINTF

# HW_FUNC_VASPRINTF
# -----------------
# Set $hw_cv_func_vasprintf to "yes" or "no".  Define HAVE_VASPRINTF to 1 if
# $hw_cv_func_vasprintf is set to "yes".  Otherwise, define vasprintf to
# rpl_vasprintf and make sure the replacement function will be built.
AC_DEFUN([HW_FUNC_VASPRINTF],
[
  AC_REQUIRE([HW_FUNC_VSNPRINTF])dnl Our vasprintf(3) calls vsnprintf(3).
  AC_CHECK_FUNCS([vasprintf],
    [hw_cv_func_vasprintf=yes],
    [hw_cv_func_vasprintf=no])
  AS_IF([test "$hw_cv_func_vasprintf" = no],
    [AC_DEFINE([vasprintf], [rpl_vasprintf],
      [Define to rpl_vasprintf if the replacement function should be used.])
    AC_CHECK_HEADERS([stdlib.h])
    HW_FUNC_VA_COPY
    AS_IF([test "$hw_cv_func_va_copy" = no],
      [HW_FUNC___VA_COPY])
    _HW_FUNC_XPRINTF_REPLACE])
])# HW_FUNC_VASPRINTF

# HW_FUNC_ASPRINTF
# ----------------
# Set $hw_cv_func_asprintf to "yes" or "no".  Define HAVE_ASPRINTF to 1 if
# $hw_cv_func_asprintf is set to "yes".  Otherwise, define asprintf to
# rpl_asprintf and make sure the replacement function will be built.
AC_DEFUN([HW_FUNC_ASPRINTF],
[
  AC_REQUIRE([HW_FUNC_VASPRINTF])dnl Our asprintf(3) calls vasprintf(3).
  AC_CHECK_FUNCS([asprintf],
    [hw_cv_func_asprintf=yes],
    [hw_cv_func_asprintf=no])
  AS_IF([test "$hw_cv_func_asprintf" = no],
    [AC_DEFINE([asprintf], [rpl_asprintf],
      [Define to rpl_asprintf if the replacement function should be used.])
    _HW_FUNC_XPRINTF_REPLACE])
])# HW_FUNC_ASPRINTF

# _HW_FUNC_XPRINTF_REPLACE
# ------------------------
# Arrange for building snprintf.c.  Must be called if one or more of the
# functions provided by snprintf.c are needed.
AC_DEFUN([_HW_FUNC_XPRINTF_REPLACE],
[
  AS_IF([test "x$_hw_cv_func_xprintf_replace_done" != xyes],
    [AC_C_CONST
    HW_HEADER_STDARG_H
    AC_LIBOBJ([snprintf])
    _hw_cv_func_xprintf_replace_done=yes])
])# _HW_FUNC_XPRINTF_REPLACE

dnl vim: set joinspaces textwidth=80:

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/cscope/cscope/aclocal.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** aclocal.m4	30 Sep 2006 17:31:14 -0000	1.8
--- aclocal.m4	10 Apr 2009 13:39:22 -0000	1.9
***************
*** 870,871 ****
--- 870,872 ----
  ]) # _AM_PROG_TAR
  
+ m4_include([acinclude.m4])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -r1.177 -r1.178
*** ChangeLog	30 Jun 2008 21:36:48 -0000	1.177
--- ChangeLog	10 Apr 2009 13:39:22 -0000	1.178
***************
*** 1,2 ****
--- 1,27 ----
+ 2009-04-10  Hans-Bernhard Broeker  <br...@ph...>
+ 
+ 	* src/snprintf.c: Replacement implementation for missing snprintf
+ 	and vsprintf, from www.jhweiss.de.
+ 	
+ 	* acinclude: New macros to optionally activate a replacement for
+ 	missing snprintf and vsprintf, from www.jhweiss.de.
+ 
+ 	* configure.in: Call new macros for snprintf and vsprintf.  Drop
+ 	AC_FUNC_LSTAT in turn, since it would have required a replacement
+ 	implementation for lstat().
+ 
+ 	* src/Makefile.am (cscope_LDADD): Added LIBOBJS to automatically
+ 	include snprintf.o in the build if and only if needed.
+ 
+ 	* configure, config.h.in, aclocal.m4, Makefile.in,
+ 	contrib/Makefile.in, doc/Makefile.in, src/Makefile.in:
+ 	Regenerated.
+ 
+ 	* src/global.h: Add prototypes for replacement snprintf and
+ 	vsnprintf.
+ 	
+ 	* src/*.c: Replace all calls of sprintf by snprintf to avoid
+ 	possible buffer overflows.
+ 
  2008-06-30  Hans-Bernhard Broeker  <br...@ph...>
  

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** config.h.in	30 Jun 2008 21:36:48 -0000	1.19
--- config.h.in	10 Apr 2009 13:39:22 -0000	1.20
***************
*** 7,10 ****
--- 7,13 ----
  #undef HAS_CURSES
  
+ /* Define to 1 if you have the `asprintf' function. */
+ #undef HAVE_ASPRINTF
+ 
  /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
     */
***************
*** 23,26 ****
--- 26,32 ----
  #undef HAVE_GETCWD
  
+ /* Define to 1 if the system has the type `intmax_t'. */
+ #undef HAVE_INTMAX_T
+ 
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
***************
*** 32,42 ****
  #undef HAVE_LIBREGEX
  
  /* Define to 1 if you have the `lstat' function. */
  #undef HAVE_LSTAT
  
- /* Define to 1 if `lstat' has the bug that it succeeds when given the
-    zero-length file name argument. */
- #undef HAVE_LSTAT_EMPTY_STRING_BUG
- 
  /* Define to 1 if you have the `memcpy' function. */
  #undef HAVE_MEMCPY
--- 38,56 ----
  #undef HAVE_LIBREGEX
  
+ /* Define to 1 if you have the `localeconv' function. */
+ #undef HAVE_LOCALECONV
+ 
+ /* Define to 1 if you have the <locale.h> header file. */
+ #undef HAVE_LOCALE_H
+ 
+ /* Define to 1 if the system has the type `long double'. */
+ #undef HAVE_LONG_DOUBLE
+ 
+ /* Define to 1 if the system has the type `long long int'. */
+ #undef HAVE_LONG_LONG_INT
+ 
  /* Define to 1 if you have the `lstat' function. */
  #undef HAVE_LSTAT
  
  /* Define to 1 if you have the `memcpy' function. */
  #undef HAVE_MEMCPY
***************
*** 51,54 ****
--- 65,71 ----
  #undef HAVE_NDIR_H
  
+ /* Define to 1 if the system has the type `ptrdiff_t'. */
+ #undef HAVE_PTRDIFF_T
+ 
  /* Define to 1 if you have the `regcmp' function. */
  #undef HAVE_REGCMP
***************
*** 66,72 ****
  #undef HAVE_SIGSETJMP
  
! /* Define to 1 if you have the `snprintf' function. */
  #undef HAVE_SNPRINTF
  
  /* Define to 1 if you have the <stdint.h> header file. */
  #undef HAVE_STDINT_H
--- 83,95 ----
  #undef HAVE_SIGSETJMP
  
! /* Define to 1 if you have a C99 compliant `snprintf' function. */
  #undef HAVE_SNPRINTF
  
+ /* Define to 1 if you have the <stdarg.h> header file. */
+ #undef HAVE_STDARG_H
+ 
+ /* Define to 1 if you have the <stddef.h> header file. */
+ #undef HAVE_STDDEF_H
+ 
  /* Define to 1 if you have the <stdint.h> header file. */
  #undef HAVE_STDINT_H
***************
*** 87,90 ****
--- 110,119 ----
  #undef HAVE_STRING_H
  
+ /* Define to 1 if `decimal_point' is member of `struct lconv'. */
+ #undef HAVE_STRUCT_LCONV_DECIMAL_POINT
+ 
+ /* Define to 1 if `thousands_sep' is member of `struct lconv'. */
+ #undef HAVE_STRUCT_LCONV_THOUSANDS_SEP
+ 
  /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
     */
***************
*** 107,114 ****
  #undef HAVE_SYS_WINDOW_H
  
  /* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H
  
! /* Define to 1 if you have the `vsnprintf' function. */
  #undef HAVE_VSNPRINTF
  
--- 136,161 ----
  #undef HAVE_SYS_WINDOW_H
  
+ /* Define to 1 if the system has the type `uintmax_t'. */
+ #undef HAVE_UINTMAX_T
+ 
+ /* Define to 1 if the system has the type `uintptr_t'. */
+ #undef HAVE_UINTPTR_T
+ 
  /* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H
  
! /* Define to 1 if the system has the type `unsigned long long int'. */
! #undef HAVE_UNSIGNED_LONG_LONG_INT
! 
! /* Define to 1 if you have the <varargs.h> header file. */
! #undef HAVE_VARARGS_H
! 
! /* Define to 1 if you have the `vasprintf' function. */
! #undef HAVE_VASPRINTF
! 
! /* Define to 1 if you have the `va_copy' function or macro. */
! #undef HAVE_VA_COPY
! 
! /* Define to 1 if you have a C99 compliant `vsnprintf' function. */
  #undef HAVE_VSNPRINTF
  
***************
*** 116,122 ****
  #undef HAVE__SETMODE
  
! /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
!    slash. */
! #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
  
  /* We're using some variant of Linux */
--- 163,168 ----
  #undef HAVE__SETMODE
  
! /* Define to 1 if you have the `__va_copy' function or macro. */
! #undef HAVE___VA_COPY
  
  /* We're using some variant of Linux */
***************
*** 176,182 ****
--- 222,235 ----
  #undef YYTEXT_POINTER
  
+ /* Define to rpl_asprintf if the replacement function should be used. */
+ #undef asprintf
+ 
  /* Define to empty if `const' does not conform to ANSI C. */
  #undef const
  
+ /* Define to the widest signed integer type if <stdint.h> and <inttypes.h> do
+    not define. */
+ #undef intmax_t
+ 
  /* Define to `int' if <sys/types.h> does not define. */
  #undef mode_t
***************
*** 187,188 ****
--- 240,258 ----
  /* Define to `unsigned int' if <sys/types.h> does not define. */
  #undef size_t
+ 
+ /* Define to rpl_snprintf if the replacement function should be used. */
+ #undef snprintf
+ 
+ /* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h>
+    do not define. */
+ #undef uintmax_t
+ 
+ /* Define to the type of an unsigned integer type wide enough to hold a
+    pointer, if such a type exists, and if the system does not define it. */
+ #undef uintptr_t
+ 
+ /* Define to rpl_vasprintf if the replacement function should be used. */
+ #undef vasprintf
+ 
+ /* Define to rpl_vsnprintf if the replacement function should be used. */
+ #undef vsnprintf

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** configure	30 Jun 2008 21:36:48 -0000	1.30
--- configure	10 Apr 2009 13:39:22 -0000	1.31
***************
*** 614,617 ****
--- 614,618 ----
  #endif"
  
+ ac_header_list=
  ac_subst_vars='SHELL
  PATH_SEPARATOR
***************
*** 1686,1689 ****
--- 1687,1692 ----
  fi
[...4686 lines suppressed...]
+ 
+ 
+ 
+ 
+ 
+ 
+     case " $LIBOBJS " in
+   *" snprintf.$ac_objext "* ) ;;
+   *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+  ;;
+ esac
+ 
+     _hw_cv_func_xprintf_replace_done=yes
+ fi
+ 
+ 
+ fi
+ 
  
  

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** configure.in	30 Sep 2006 17:31:14 -0000	1.34
--- configure.in	10 Apr 2009 13:39:23 -0000	1.35
***************
*** 402,408 ****
  AC_TYPE_SIGNAL
  AC_CHECK_FUNCS(strchr memcpy memset setmode _setmode)
! AC_CHECK_FUNCS(getcwd regcmp regcomp strerror vsnprintf snprintf lstat)
  AC_CHECK_FUNCS(fixkeypad)
! AC_FUNC_LSTAT
  
  case "$host_os" in
--- 402,411 ----
  AC_TYPE_SIGNAL
  AC_CHECK_FUNCS(strchr memcpy memset setmode _setmode)
! AC_CHECK_FUNCS(getcwd regcmp regcomp strerror lstat)
  AC_CHECK_FUNCS(fixkeypad)
! HW_FUNC_SNPRINTF
! HW_FUNC_VSNPRINTF
! HW_FUNC_ASPRINTF
! HW_FUNC_VASPRINTF
  
  case "$host_os" in

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in	30 Jun 2008 21:36:48 -0000	1.10
--- Makefile.in	10 Apr 2009 13:39:23 -0000	1.11
***************
*** 44,48 ****
  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)
--- 44,49 ----
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
! 	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)

Update of /cvsroot/cscope/cscope/doc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099/doc

Modified Files:
	Makefile.in 
Log Message:
Replace all usage of (v)sprintf by (v)snprintf.
Supply and use optional replacement snprintf on systems that don't have it.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in	30 Jun 2008 21:36:48 -0000	1.9
--- Makefile.in	10 Apr 2009 13:39:23 -0000	1.10
***************
*** 40,44 ****
  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)
--- 40,45 ----
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
! 	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)

Update of /cvsroot/cscope/cscope/contrib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099/contrib

Modified Files:
	Makefile.in 
Log Message:
Replace all usage of (v)sprintf by (v)snprintf.
Supply and use optional replacement snprintf on systems that don't have it.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in	30 Jun 2008 21:36:48 -0000	1.10
--- Makefile.in	10 Apr 2009 13:39:23 -0000	1.11
***************
*** 41,45 ****
  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)
--- 41,46 ----
  DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
! 	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)