cscope-cvs Mailing List for cscope

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv25870

Modified Files:
	ChangeLog 
Log Message:
Cygwin-related fixes:

* move #include <fcntl.h> above #ifdef O_TEXT/O_BINARY detection stuff
* call myexit() instead of exit() everywhere
* enable AC_EXEEXT stuff

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** ChangeLog	11 Jul 2002 14:23:45 -0000	1.116
--- ChangeLog	28 Jul 2002 15:42:40 -0000	1.117
***************
*** 1,2 ****
--- 1,7 ----
+ (2002/07/27 - broeker) Yet another round of Cygwin-related fixes.  Do the 
+ 		       #include <fcntl.h> early enough, so checks for 
+ 		       O_BINARY work.  Make sure that myexit() is always
+ 		       called instead of calling exit() directly.  Add
+ 		       AC_EXEEXT to configure.in.
  (2002/07/10 - broeker) Get rid of assumption about values of access()
  	               parameters W_OK and R_OK --- make assumptions only 

Update of /cvsroot/cscope/cscope/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv25314/contrib

Modified Files:
	Makefile.in 
Log Message:
Cygwin-related fixes:

* move #include <fcntl.h> above #ifdef O_TEXT/O_BINARY detection stuff
* call myexit() instead of exit() everywhere
* enable AC_EXEEXT stuff

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	2 Jan 2002 17:26:34 -0000	1.4
--- Makefile.in	28 Jul 2002 15:40:06 -0000	1.5
***************
*** 63,66 ****
--- 63,67 ----
  CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@
  CURSES_LIBS = @CURSES_LIBS@
+ EXEEXT = @EXEEXT@
  LEX = @LEX@
  LEXLIB = @LEXLIB@

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv25314

Modified Files:
	configure.in Makefile.in 
Log Message:
Cygwin-related fixes:

* move #include <fcntl.h> above #ifdef O_TEXT/O_BINARY detection stuff
* call myexit() instead of exit() everywhere
* enable AC_EXEEXT stuff

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** configure.in	11 Jul 2002 14:23:45 -0000	1.24
--- configure.in	28 Jul 2002 15:40:06 -0000	1.25
***************
*** 144,147 ****
--- 144,148 ----
  AC_PROG_INSTALL
  AC_PROG_CC
+ AC_EXEEXT
  AMNU_PROG_LEX
  AM_CONDITIONAL(USING_LEX, test "x$LEX" = "xlex")

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	2 Jan 2002 17:26:34 -0000	1.4
--- Makefile.in	28 Jul 2002 15:40:06 -0000	1.5
***************
*** 63,66 ****
--- 63,67 ----
  CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@
  CURSES_LIBS = @CURSES_LIBS@
+ EXEEXT = @EXEEXT@
  LEX = @LEX@
  LEXLIB = @LEXLIB@

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv25314/src

Modified Files:
	Makefile.in alloc.c command.c exec.c global.h logdir.c main.c 
	mypopen.c vp.h vpopen.c 
Log Message:
Cygwin-related fixes:

* move #include <fcntl.h> above #ifdef O_TEXT/O_BINARY detection stuff
* call myexit() instead of exit() everywhere
* enable AC_EXEEXT stuff

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.in	2 Jan 2002 17:26:35 -0000	1.6
--- Makefile.in	28 Jul 2002 15:40:06 -0000	1.7
***************
*** 63,66 ****
--- 63,67 ----
  CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@
  CURSES_LIBS = @CURSES_LIBS@
+ EXEEXT = @EXEEXT@
  LEX = @LEX@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
***************
*** 91,94 ****
--- 92,96 ----
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
+ bin_PROGRAMS =  cscope$(EXEEXT)
  PROGRAMS =  $(bin_PROGRAMS)
  
***************
*** 185,190 ****
  maintainer-clean-compile:
  
! cscope: $(cscope_OBJECTS) $(cscope_DEPENDENCIES)
! 	@rm -f cscope
  	$(LINK) $(cscope_LDFLAGS) $(cscope_OBJECTS) $(cscope_LDADD) $(LIBS)
  .l.c:
--- 187,192 ----
  maintainer-clean-compile:
  
! cscope$(EXEEXT): $(cscope_OBJECTS) $(cscope_DEPENDENCIES)
! 	@rm -f cscope$(EXEEXT)
  	$(LINK) $(cscope_LDFLAGS) $(cscope_OBJECTS) $(cscope_LDADD) $(LIBS)
  .l.c:

Index: alloc.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/alloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** alloc.c	9 May 2000 13:37:10 -0000	1.4
--- alloc.c	28 Jul 2002 15:40:07 -0000	1.5
***************
*** 48,52 ****
  # else
  char	*calloc(), *malloc(), *realloc(), *strcpy();
- void	exit();
  # endif
  
--- 48,51 ----
***************
*** 90,94 ****
  	if (p == NULL) {
  		(void) fprintf(stderr, "\n%s: out of storage\n", argv0);
! 		exit(1);
  	}
  	return(p);
--- 89,93 ----
  	if (p == NULL) {
  		(void) fprintf(stderr, "\n%s: out of storage\n", argv0);
! 		myexit(1);
  	}
  	return(p);

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** command.c	8 Jul 2002 15:52:24 -0000	1.18
--- command.c	28 Jul 2002 15:40:07 -0000	1.19
***************
*** 44,48 ****
  #include <curses.h>
  #endif
- #include <fcntl.h>	/* O_RDONLY */
  #include <ctype.h>
  
--- 44,47 ----

Index: exec.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/exec.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** exec.c	5 Jul 2001 16:47:04 -0000	1.7
--- exec.c	28 Jul 2002 15:40:07 -0000	1.8
***************
*** 128,132 ****
  	perror(msg);		/* display the reason */
  	askforreturn();		/* wait until the user sees the message */
! 	exit(1);		/* exit the child */
  	/* NOTREACHED */
  }
--- 128,132 ----
  	perror(msg);		/* display the reason */
  	askforreturn();		/* wait until the user sees the message */
! 	myexit(1);		/* exit the child */
  	/* NOTREACHED */
  }

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** global.h	11 Jul 2002 14:23:45 -0000	1.21
--- global.h	28 Jul 2002 15:40:07 -0000	1.22
***************
*** 107,110 ****
--- 107,116 ----
  #endif
  
+ /* HBB 20020728: if <fcntl.h> is there, #include it here, since that's
+  * where the system definitions of O_TEXT should be coming from */
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+ 
  /* HBB 20020103: Need to force text or binary mode opens on Cygwins,
   * because of their "binary/text mode mount" silliness :-( */

Index: logdir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/logdir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** logdir.c	5 Jul 2001 16:47:04 -0000	1.4
--- logdir.c	28 Jul 2002 15:40:07 -0000	1.5
***************
*** 42,46 ****
  #include <unistd.h>
  #include <string.h>
- #include <fcntl.h>
  #include "global.h"
  
--- 42,45 ----

Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** main.c	10 Oct 2001 16:49:22 -0000	1.26
--- main.c	28 Jul 2002 15:40:07 -0000	1.27
***************
*** 49,53 ****
  #include <curses.h>
  #endif
- #include <fcntl.h>	/* O_RDONLY */
  #include <sys/types.h>	/* needed by stat.h */
  #include <sys/stat.h>	/* stat */
--- 49,52 ----
***************
*** 152,156 ****
  				if (strlen(s) > PATLEN) {
  					(void) fprintf(stderr, "cscope: pattern too long, cannot be > %d characters\n", PATLEN);
! 					exit(1);
  				}
  				(void) strcpy(pattern, s);
--- 151,155 ----
  				if (strlen(s) > PATLEN) {
  					(void) fprintf(stderr, "cscope: pattern too long, cannot be > %d characters\n", PATLEN);
! 					myexit(1);
  				}
  				(void) strcpy(pattern, s);
***************
*** 169,173 ****
  				(void) fprintf(stderr, "%s: version %d%s\n", argv0,
  					FILEVERSION, FIXVERSION);
! 				exit(0);
  #endif
  			case 'b':	/* only build the cross-reference */
--- 168,172 ----
  				(void) fprintf(stderr, "%s: version %d%s\n", argv0,
  					FILEVERSION, FIXVERSION);
! 				myexit(0);
  #endif
  			case 'b':	/* only build the cross-reference */
***************
*** 190,194 ****
  			case 'h':
  				(void) longusage();
! 				exit(1);
  			case 'k':	/* ignore DFLT_INCDIR */
  				kernelmode = YES;
--- 189,193 ----
  			case 'h':
  				(void) longusage();
! 				myexit(1);
  			case 'k':	/* ignore DFLT_INCDIR */
  				kernelmode = YES;
***************
*** 289,293 ****
  				(void) usage();
  				(void) fprintf(stderr, "Try the -h option for more information.\n");
! 				exit(1);
  			}
  		}
--- 288,292 ----
  				(void) usage();
  				(void) fprintf(stderr, "Try the -h option for more information.\n");
! 				myexit(1);
  			}
  		}
***************
*** 309,313 ****
  	{
  	    fprintf (stderr, "cscope: Must use -b if file list comes from stdin\n");
! 	    exit(1);
  	}
  
--- 308,312 ----
  	{
  	    fprintf (stderr, "cscope: Must use -b if file list comes from stdin\n");
! 	    myexit(1);
  	}
  
***************
*** 317,321 ****
  		fprintf (stderr, "cscope: Temporary directory %s does not exist or cannot be accessed\n", tmpdir);
  		fprintf (stderr, "cscope: Please create the directory or set the environment variable\ncscope: TMPDIR to a valid directory\n");
! 		exit(1);
  	}
  
--- 316,320 ----
  		fprintf (stderr, "cscope: Temporary directory %s does not exist or cannot be accessed\n", tmpdir);
  		fprintf (stderr, "cscope: Please create the directory or set the environment variable\ncscope: TMPDIR to a valid directory\n");
! 		myexit(1);
  	}
  
***************
*** 481,485 ****
  				if (fscanf(oldrefs, "%s", path) != 1) {
   					posterr("cscope: cannot read source file name from file %s\n", reffile);
! 					exit(1);
  				}
  				srcfiles[i] = stralloc(path);
--- 480,484 ----
  				if (fscanf(oldrefs, "%s", path) != 1) {
   					posterr("cscope: cannot read source file name from file %s\n", reffile);
! 					myexit(1);
  				}
  				srcfiles[i] = stralloc(path);
***************
*** 722,731 ****
  	if (fscanf(oldrefs, "%d", &i) != 1) {
  		posterr("cscope: cannot read list size from file %s\n", reffile);
! 		exit(1);
  	}
  	while (--i >= 0) {
  		if (fscanf(oldrefs, "%*s") != 0) {
  			posterr("cscope: cannot read list name from file %s\n", reffile);
! 			exit(1);
  		}
  	}
--- 721,730 ----
  	if (fscanf(oldrefs, "%d", &i) != 1) {
  		posterr("cscope: cannot read list size from file %s\n", reffile);
! 		myexit(1);
  	}
  	while (--i >= 0) {
  		if (fscanf(oldrefs, "%*s") != 0) {
  			posterr("cscope: cannot read list name from file %s\n", reffile);
! 			myexit(1);
  		}
  	}

Index: mypopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mypopen.c	11 Jul 2002 14:23:45 -0000	1.9
--- mypopen.c	28 Jul 2002 15:40:07 -0000	1.10
***************
*** 33,37 ****
  #include <stdio.h>
  #include <signal.h>
- #include <fcntl.h>
  #include <unistd.h>
  #include <sys/types.h>
--- 33,36 ----

Index: vp.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** vp.h	4 Jan 2002 12:11:50 -0000	1.4
--- vp.h	28 Jul 2002 15:40:07 -0000	1.5
***************
*** 45,49 ****
  #define MAXPATH	200		/* max length for entire name */
  
! #include <fcntl.h>
  #include <sys/stat.h>
  
--- 45,57 ----
  #define MAXPATH	200		/* max length for entire name */
  
! #ifdef HAVE_CONFIG_H
! # include "config.h"
! #else
! # define HAVE_FCNTL_H 1		/* in case of doubt, assume it's there */
! #endif
! #ifdef HAVE_FCNTL_H
! # include <fcntl.h>		/* needed for O_... open flags */
! #endif
! 
  #include <sys/stat.h>
  

Index: vpopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vpopen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** vpopen.c	3 May 2000 22:02:10 -0000	1.3
--- vpopen.c	28 Jul 2002 15:40:07 -0000	1.4
***************
*** 35,39 ****
  
  #include <stdio.h>
- #include <fcntl.h>
  #include "global.h"
  #include "vp.h"
--- 35,38 ----

Update of /cvsroot/cscope/cscope/doc
In directory usw-pr-cvs1:/tmp/cvs-serv25314/doc

Modified Files:
	Makefile.in 
Log Message:
Cygwin-related fixes:

* move #include <fcntl.h> above #ifdef O_TEXT/O_BINARY detection stuff
* call myexit() instead of exit() everywhere
* enable AC_EXEEXT stuff

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	2 Jan 2002 17:26:35 -0000	1.3
--- Makefile.in	28 Jul 2002 15:40:06 -0000	1.4
***************
*** 63,66 ****
--- 63,67 ----
  CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@
  CURSES_LIBS = @CURSES_LIBS@
+ EXEEXT = @EXEEXT@
  LEX = @LEX@
  LEXLIB = @LEXLIB@

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv8314/src

Modified Files:
	constants.h global.h mypopen.c 
Log Message:
Fixes for DOS: access() bits, lstat()->stat(), BSD<->DOS setmode()

Index: constants.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/constants.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** constants.h	13 Aug 2001 15:31:22 -0000	1.11
--- constants.h	11 Jul 2002 14:23:45 -0000	1.12
***************
*** 77,82 ****
  
  #define	STMTMAX	10000		/* maximum source statement length */
! #define	READ	4		/* access(2) parameter */
! #define	WRITE	2		/* access(2) parameter */
  /* screen lines */
  #define	FLDLINE	(LINES - FIELDS - 1)	/* first input field line */
--- 77,81 ----
  
  #define	STMTMAX	10000		/* maximum source statement length */
! 
  /* screen lines */
  #define	FLDLINE	(LINES - FIELDS - 1)	/* first input field line */

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** global.h	4 Jan 2002 12:11:50 -0000	1.20
--- global.h	11 Jul 2002 14:23:45 -0000	1.21
***************
*** 125,128 ****
--- 125,158 ----
  #endif 
  
+ #undef SETMODE
+ #if O_BINARY || O_TEXT
+ /* OK, looks like we are on an MSDOS-ish platform ---> define SETMODE
+  * to actually do something */
+ # ifdef HAVE_SETMODE
+ #  define SETMODE(fildes, mode) setmode(fildes,mode)
+ # else 
+ #  ifdef HAVE__SETMODE
+ #   define SETMODE(fildes, mode) _setmode(fildes,mode)
+ #  endif
+ # endif
+ #endif
+ 
+ /* access(2) parameters. Only make assumptions about their values if
+  * <unistd.h> fails to define them. */
+ #ifdef R_OK
+ # define	READ	R_OK
+ #else
+ # define	READ	4	
+ #endif
+ #ifdef W_OK
+ # define	WRITE	W_OK
+ #else
+ # define	WRITE	2
+ #endif
+ 
+ /* This can happen on only vaguely Unix-ish platforms... */
+ #ifndef HAVE_LSTAT
+ # define	lstat(file,buf)	stat(file,buf)
+ #endif
  
  typedef	enum	{		/* boolean data type */

Index: mypopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** mypopen.c	4 Jan 2002 12:11:50 -0000	1.8
--- mypopen.c	11 Jul 2002 14:23:45 -0000	1.9
***************
*** 43,50 ****
  #define	WTR	1
  
- #if !defined(HAVE_SETMODE) && defined(HAVE__SETMODE)
- # define setmode _setmode
- #endif
- 
  /* HBB 20010312: make this a bit safer --- don't blindly assume it's 1 */
  #ifdef FD_CLOEXEC
--- 43,46 ----
***************
*** 108,116 ****
  	fp = fopen(path, mode);
  
! #if HAVE_SETMODE
  	if (! strchr(mode, 'b')) {
! 		setmode(fileno(fp), O_TEXT);
  	}
! #endif /* HAVE_SETMODE */
  	
  #ifdef __DJGPP__ /* FIXME: test feature, not platform */
--- 104,112 ----
  	fp = fopen(path, mode);
  
! #ifdef SETMODE
  	if (! strchr(mode, 'b')) {
! 		SETMODE(fileno(fp), O_TEXT);
  	}
! #endif /* SETMODE */
  	
  #ifdef __DJGPP__ /* FIXME: test feature, not platform */

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv8314

Modified Files:
	ChangeLog config.h.in configure configure.in 
Log Message:
Fixes for DOS: access() bits, lstat()->stat(), BSD<->DOS setmode()

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** ChangeLog	8 Jul 2002 15:52:24 -0000	1.115
--- ChangeLog	11 Jul 2002 14:23:45 -0000	1.116
***************
*** 1,2 ****
--- 1,8 ----
+ (2002/07/10 - broeker) Get rid of assumption about values of access()
+ 	               parameters W_OK and R_OK --- make assumptions only 
+ 		       if system doesn't supply values.  Add check for 
+ 		       existence of lstat(); fall back to stat() if not
+ 		       available.  Avoid confusion of DOS' setmode() with
+ 		       BSD function of same name...
  (2002/07/07 - broeker) Delete tempfile before redirecting to it, to avoid 
  	               complaints about clobbering from poorly configured 

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** config.h.in	4 Jan 2002 12:11:50 -0000	1.11
--- config.h.in	11 Jul 2002 14:23:45 -0000	1.12
***************
*** 67,70 ****
--- 67,73 ----
  #undef HAVE_GETCWD
  
+ /* Define if you have the lstat function.  */
+ #undef HAVE_LSTAT
+ 
  /* Define if you have the memcpy function.  */
  #undef HAVE_MEMCPY

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** configure	13 Mar 2002 20:39:13 -0000	1.17
--- configure	11 Jul 2002 14:23:45 -0000	1.18
***************
*** 2407,2480 ****
  fi
  
- for ac_func in strchr memcpy memset setmode _setmode
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:2413: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 2418 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
- int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
- $ac_func();
- #endif
- 
- ; return 0; }
- EOF
- if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
- fi
- 
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_func 1
- EOF
-  
- else
-   echo "$ac_t""no" 1>&6
- fi
- done
- 
  for ac_hdr in fcntl.h sys/window.h sys/termios.h unistd.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2469: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2474 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2407,2425 ----
  fi
  
  for ac_hdr in fcntl.h sys/window.h sys/termios.h unistd.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2414: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2419 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 2504,2513 ****
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2507: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2512 "configure"
  #include "confdefs.h"
  
--- 2449,2458 ----
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2452: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2457 "configure"
  #include "confdefs.h"
  
***************
*** 2558,2562 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
--- 2503,2507 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
***************
*** 2579,2588 ****
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:2582: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2587 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2524,2533 ----
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:2527: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2532 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 2612,2621 ****
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:2615: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2620 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2557,2566 ----
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:2560: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2565 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 2645,2654 ****
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:2648: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2653 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2590,2599 ----
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:2593: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2598 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 2679,2688 ****
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2682: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2687 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2624,2633 ----
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2627: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2632 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 2701,2705 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
--- 2646,2650 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
***************
*** 2719,2723 ****
  
  
! for ac_func in getcwd regcmp regcomp strerror vsnprintf snprintf
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--- 2664,2723 ----
  
  
! for ac_func in strchr memcpy memset setmode _setmode
! do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2670: checking for $ac_func" >&5
! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&6
! else
!   cat > conftest.$ac_ext <<EOF
! #line 2675 "configure"
! #include "confdefs.h"
! /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char $ac_func(); below.  */
! #include <assert.h>
! /* Override any gcc2 internal prototype to avoid an error.  */
! /* We use char because int might match the return type of a gcc2
!     builtin and then its argument prototype would still apply.  */
! char $ac_func();
! 
! int main() {
! 
! /* The GNU C library defines this for functions which it implements
!     to always fail with ENOSYS.  Some functions are actually named
!     something starting with __ and the normal name is an alias.  */
! #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
! choke me
! #else
! $ac_func();
! #endif
! 
! ; return 0; }
! EOF
! if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
!   rm -rf conftest*
!   eval "ac_cv_func_$ac_func=yes"
! else
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   eval "ac_cv_func_$ac_func=no"
! fi
! rm -f conftest*
! fi
! 
! if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   echo "$ac_t""yes" 1>&6
!     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
!   cat >> confdefs.h <<EOF
! #define $ac_tr_func 1
! EOF
!  
! else
!   echo "$ac_t""no" 1>&6
! fi
! done
! 
! for ac_func in getcwd regcmp regcomp strerror vsnprintf snprintf lstat
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** configure.in	13 Mar 2002 20:39:13 -0000	1.23
--- configure.in	11 Jul 2002 14:23:45 -0000	1.24
***************
*** 482,486 ****
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_FUNCS(strchr memcpy memset setmode _setmode)
  AC_CHECK_HEADERS(fcntl.h sys/window.h sys/termios.h unistd.h)
  
--- 482,485 ----
***************
*** 493,497 ****
  dnl Checks for library functions.
  AC_TYPE_SIGNAL
! AC_CHECK_FUNCS(getcwd regcmp regcomp strerror vsnprintf snprintf)
  AC_CHECK_FUNCS(fixkeypad)
  
--- 492,497 ----
  dnl Checks for library functions.
  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)
  

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv28309/src

Modified Files:
	command.c 
Log Message:
Avoid shell complaint about clobbering files in redirection

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** command.c	22 Nov 2001 17:38:19 -0000	1.17
--- command.c	8 Jul 2002 15:52:24 -0000	1.18
***************
*** 379,382 ****
--- 379,388 ----
  		if (commandc == '^') {
  			(void) strcat(strcat(newpat, " >"), temp2);
+ 			/* HBB 20020708: somebody might have even
+ 			 * their non-interactive default shells
+ 			 * complain about clobbering
+ 			 * redirections... --> delete before
+ 			 * overwriting */
+ 			remove(temp2);
  		}
  		exitcurses();

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv28309

Modified Files:
	ChangeLog 
Log Message:
Avoid shell complaint about clobbering files in redirection

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** ChangeLog	20 Jun 2002 16:26:50 -0000	1.114
--- ChangeLog	8 Jul 2002 15:52:24 -0000	1.115
***************
*** 1,2 ****
--- 1,5 ----
+ (2002/07/07 - broeker) Delete tempfile before redirecting to it, to avoid 
+ 	               complaints about clobbering from poorly configured 
+ 		       default shells.
  (2002/06/20 - broeker) Fix operation of -C -L0 if pattern contains any
  	               upper-case characters.