cscope-cvs Mailing List for cscope

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

Modified Files:
	ChangeLog config.h.in configure configure.in 
Log Message:
Fix against Cygwin binmode mounts of source files

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** ChangeLog	2002/01/02 17:26:34	1.108
--- ChangeLog	2002/01/04 12:11:50	1.109
***************
*** 1,2 ****
--- 1,4 ----
+ (2001/01/04 - broeker) Survive Cygwin "binmode" mounted filesystems by 
+ 	               explicitly forcing text mode for source files.
  (2002/01/02 - broeker) Updated files supplied or generated by automake to 
  	               version 1.4-p5, the current recommended version in the

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** config.h.in	2001/09/27 12:41:00	1.10
--- config.h.in	2002/01/04 12:11:50	1.11
***************
*** 58,61 ****
--- 58,64 ----
  #undef USING_LEX
  
+ /* Define if you have the _setmode function.  */
+ #undef HAVE__SETMODE
+ 
  /* Define if you have the fixkeypad function.  */
  #undef HAVE_FIXKEYPAD
***************
*** 75,78 ****
--- 78,84 ----
  /* Define if you have the regcomp function.  */
  #undef HAVE_REGCOMP
+ 
+ /* Define if you have the setmode function.  */
+ #undef HAVE_SETMODE
  
  /* Define if you have the snprintf function.  */

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** configure	2001/09/27 12:41:00	1.15
--- configure	2002/01/04 12:11:50	1.16
***************
*** 2406,2410 ****
  fi
  
! for ac_func in strchr memcpy memset
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--- 2406,2410 ----
  fi
  
! for ac_func in strchr memcpy memset setmode _setmode
  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.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** configure.in	2001/09/27 12:38:18	1.21
--- configure.in	2002/01/04 12:11:50	1.22
***************
*** 481,485 ****
  AC_HEADER_DIRENT
  AC_HEADER_STDC
! AC_CHECK_FUNCS(strchr memcpy memset)
  AC_CHECK_HEADERS(fcntl.h sys/window.h sys/termios.h unistd.h)
  
--- 481,485 ----
  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)
  

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

Modified Files:
	global.h mypopen.c vp.h 
Log Message:
Fix against Cygwin binmode mounts of source files

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** global.h	2001/10/10 16:49:22	1.19
--- global.h	2002/01/04 12:11:50	1.20
***************
*** 107,110 ****
--- 107,129 ----
  #endif
  
+ /* HBB 20020103: Need to force text or binary mode opens on Cygwins,
+  * because of their "binary/text mode mount" silliness :-( */
+ #ifndef O_TEXT
+ # ifdef _O_TEXT
+ #  define O_TEXT _O_TEXT
+ # else
+ #  define O_TEXT 0x00
+ # endif
+ #endif
+ /* Same for binary mode --- moved here from vp.h */
+ #ifndef O_BINARY
+ # ifdef _O_BINARY
+ #  define O_BINARY _O_BINARY
+ # else
+ #  define O_BINARY 0x00
+ # endif
+ #endif 
+ 
+ 
  typedef	enum	{		/* boolean data type */
  	NO,

Index: mypopen.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mypopen.c	2001/07/05 15:08:21	1.7
--- mypopen.c	2002/01/04 12:11:50	1.8
***************
*** 43,46 ****
--- 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
***************
*** 61,64 ****
--- 65,75 ----
  	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);
***************
*** 97,100 ****
--- 108,117 ----
  	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 */
  	/* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it 
***************
*** 106,110 ****
  		return(fp);
  
! 	else return(NULL);
  }
  
--- 123,128 ----
  		return(fp);
  
! 	else
! 		return(NULL);
  }
  

Index: vp.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/vp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** vp.h	2001/07/05 14:31:00	1.3
--- vp.h	2002/01/04 12:11:50	1.4
***************
*** 48,62 ****
  #include <sys/stat.h>
  
- /* In view of DOS portability, we may need the vale of the O_BINARY
-  * bit mask. On Unix platforms, it's not defined, nor is it needed -->
-  * set it to a no-op value */
- #ifndef O_BINARY
- # ifdef _O_BINARY
- #  define O_BINARY _O_BINARY
- # else
- #  define O_BINARY 0x00
- # endif
- #endif 
- 
  #if !NOMALLOC
  extern	char	**vpdirs;	/* directories (including current) in view path */
--- 48,51 ----

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

Modified Files:
	Makefile.in 
Log Message:
Upgrade to automake version 1.4-p5

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	2001/07/02 16:06:43	1.3
--- Makefile.in	2002/01/02 17:26:34	1.4
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,

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

Modified Files:
	ChangeLog Makefile.in aclocal.m4 config.guess 
Log Message:
Upgrade to automake version 1.4-p5

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** ChangeLog	2001/11/22 17:38:19	1.107
--- ChangeLog	2002/01/02 17:26:34	1.108
***************
*** 1,3 ****
! (2001/11/22 - broeker) Quell some compiler warnings cause by missing #includes
  	               and private declarations of system library functions.
  (2001/10/30 - petrs)   Added Joe Steffen to author's list as the creator.
--- 1,8 ----
! (2002/01/02 - broeker) Updated files supplied or generated by automake to 
! 	               version 1.4-p5, the current recommended version in the
! 		       1.4 series.
! (2002/01/02 - broeker) Add handling of "quoted filenames with blanks in" in
! 	               namelist files
! (2001/11/22 - broeker) Quell some compiler warnings caused by missing #includes
  	               and private declarations of system library functions.
  (2001/10/30 - petrs)   Added Joe Steffen to author's list as the creator.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	2001/06/27 16:42:25	1.3
--- Makefile.in	2002/01/02 17:26:34	1.4
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 169,173 ****
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
--- 169,173 ----
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" != "." || dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/cscope/cscope/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aclocal.m4	2001/06/27 16:42:25	1.2
--- aclocal.m4	2002/01/02 17:26:34	1.3
***************
*** 1,5 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4
  
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! dnl aclocal.m4 generated automatically by aclocal 1.4-p5
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
***************
*** 20,24 ****
  dnl AM_INIT_AUTOMAKE(package,version, [no-define])
  
! AC_DEFUN(AM_INIT_AUTOMAKE,
  [AC_REQUIRE([AC_PROG_INSTALL])
  PACKAGE=[$1]
--- 20,24 ----
  dnl AM_INIT_AUTOMAKE(package,version, [no-define])
  
! AC_DEFUN([AM_INIT_AUTOMAKE],
  [AC_REQUIRE([AC_PROG_INSTALL])
  PACKAGE=[$1]
***************
*** 48,52 ****
  #
  
! AC_DEFUN(AM_SANITY_CHECK,
  [AC_MSG_CHECKING([whether build environment is sane])
  # Just in case
--- 48,52 ----
  #
  
! AC_DEFUN([AM_SANITY_CHECK],
  [AC_MSG_CHECKING([whether build environment is sane])
  # Just in case
***************
*** 89,93 ****
  dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
  dnl The program must properly implement --version.
! AC_DEFUN(AM_MISSING_PROG,
  [AC_MSG_CHECKING(for working $2)
  # Run test in a subshell; some versions of sh will print an error if
--- 89,93 ----
  dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
  dnl The program must properly implement --version.
! AC_DEFUN([AM_MISSING_PROG],
  [AC_MSG_CHECKING(for working $2)
  # Run test in a subshell; some versions of sh will print an error if
***************
*** 105,109 ****
  # Like AC_CONFIG_HEADER, but automatically create stamp file.
  
! AC_DEFUN(AM_CONFIG_HEADER,
  [AC_PREREQ([2.12])
  AC_CONFIG_HEADER([$1])
--- 105,109 ----
  # Like AC_CONFIG_HEADER, but automatically create stamp file.
  
! AC_DEFUN([AM_CONFIG_HEADER],
  [AC_PREREQ([2.12])
  AC_CONFIG_HEADER([$1])
***************
*** 128,132 ****
  # Define a conditional.
  
! AC_DEFUN(AM_CONDITIONAL,
  [AC_SUBST($1_TRUE)
  AC_SUBST($1_FALSE)
--- 128,132 ----
  # Define a conditional.
  
! AC_DEFUN([AM_CONDITIONAL],
  [AC_SUBST($1_TRUE)
  AC_SUBST($1_FALSE)
***************
*** 142,146 ****
  dnl AM_PROG_LEX
  dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
! AC_DEFUN(AM_PROG_LEX,
  [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
  AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
--- 142,146 ----
  dnl AM_PROG_LEX
  dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
! AC_DEFUN([AM_PROG_LEX],
  [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
  AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")

Index: config.guess
===================================================================
RCS file: /cvsroot/cscope/cscope/config.guess,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** config.guess	2001/02/09 19:59:59	1.2
--- config.guess	2002/01/02 17:26:34	1.3
***************
*** 1,6 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
! #
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--- 1,9 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
[...1408 lines suppressed...]
! /bin/universe          = `(/bin/universe) 2>/dev/null`
! /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
! /bin/arch              = `(/bin/arch) 2>/dev/null`
! /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
! /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
! 
! UNAME_MACHINE = ${UNAME_MACHINE}
! UNAME_RELEASE = ${UNAME_RELEASE}
! UNAME_SYSTEM  = ${UNAME_SYSTEM}
! UNAME_VERSION = ${UNAME_VERSION}
! EOF
  
  exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:

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

Modified Files:
	Makefile.in 
Log Message:
Upgrade to automake version 1.4-p5

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in	2001/06/27 16:42:25	1.2
--- Makefile.in	2002/01/02 17:26:35	1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,

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

Modified Files:
	Makefile.in 
Log Message:
Upgrade to automake version 1.4-p5

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.in	2001/07/09 14:00:25	1.5
--- Makefile.in	2002/01/02 17:26:35	1.6
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,

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

Modified Files:
	cscope.1 
Log Message:
Quoted filenames in namelist files

Index: cscope.1
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/cscope.1,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** cscope.1	2001/06/15 11:01:14	1.15
--- cscope.1	2002/01/02 17:25:48	1.16
***************
*** 89,98 ****
  .TP
  .B -i namefile
! Browse through all source files whose names are listed in
! namefile (file names separated by spaces, tabs, or new-lines)
! instead of the default (cscope.files). If this option is
! specified, cscope ignores any files appearing on the command
! line. The argument namefile can be set to ``-'' to accept a list of
! files from stdio.
  .TP
  .B -k
--- 89,100 ----
  .TP
  .B -i namefile
! Browse through all source files whose names are listed in namefile
! (file names separated by spaces, tabs, or new-lines) instead of the
! default (cscope.files). If this option is specified, cscope ignores
! any files appearing on the command line. The argument namefile can be
! set to ``-'' to accept a list of files from stdio.  Filenames in the
! namefile that contain whitespace have to be enclosed in "double
! quotes".  Inside such quoted filenames, any double-quote and backslash
! characters have to be escaped by backslashes.
  .TP
  .B -k

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

Modified Files:
	dir.c 
Log Message:
Quoted filenames in namelist files

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** dir.c	2001/10/10 16:47:20	1.14
--- dir.c	2002/01/02 17:25:48	1.15
***************
*** 352,355 ****
--- 352,387 ----
  				}
  			}
+ 			else if (*path == '"') {
+ 				/* handle quoted filenames... */
+ 				size_t in = 1, out = 0;
+ 				char *newpath = mymalloc(PATHLEN + 1);
+ 
+ 				while (in < PATHLEN && path[in] != '\0') {
+ 					if (path[in] == '"') {
+ 						newpath[out] = '\0';
+ 						break;	/* found end of quoted string */
+ 					}
+ 					else if (path[in] == '\\' && in < PATHLEN - 1
+ 						 && (path[in + 1]== '"' || path[in + 1] == '\\')) {
+ 						/* un-escape \" or \\ sequence */
+ 						newpath[out++] = path[in + 1];
+ 						in += 2;
+ 					}
+ 					else {
+ 						newpath[out++] = path[in++];
+ 					}
+ 				} /* while */ 
+ 				if (i >= PATHLEN) { /* safeguard against almost-overflow */
+ 					newpath[out]='\0';
+ 				}
+ 				if ((s = inviewpath(newpath)) != NULL) {
+ 					addsrcfile(s);
+ 				}
+ 				else {
+ 					(void) fprintf(stderr, "cscope: cannot find file %s\n",
+ 								   newpath);
+ 					errorsfound = YES;
+ 				}
+ 			} /* if (quoted entry) */
  			else if ((s = inviewpath(path)) != NULL) {
  				addsrcfile(s);