Menu
▾
▴
cscope-cvs — CVS activity mailing list
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(2) |
Feb
(9) |
Mar
(6) |
Apr
(8) |
May
(7) |
Jun
(49) |
Jul
(36) |
Aug
(8) |
Sep
(4) |
Oct
(11) |
Nov
(3) |
Dec
|
| 2002 |
Jan
(8) |
Feb
|
Mar
(7) |
Apr
(2) |
May
|
Jun
(3) |
Jul
(9) |
Aug
(2) |
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2003 |
Jan
(6) |
Feb
|
Mar
(2) |
Apr
(3) |
May
|
Jun
(5) |
Jul
|
Aug
(6) |
Sep
(6) |
Oct
(2) |
Nov
|
Dec
|
| 2004 |
Jan
(2) |
Feb
(12) |
Mar
|
Apr
(10) |
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(2) |
Dec
(4) |
| 2005 |
Jan
(4) |
Feb
(6) |
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2006 |
Jan
|
Feb
(2) |
Mar
|
Apr
(12) |
May
(2) |
Jun
|
Jul
(6) |
Aug
(4) |
Sep
(11) |
Oct
(10) |
Nov
|
Dec
|
| 2007 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2008 |
Jan
|
Feb
(2) |
Mar
(4) |
Apr
(2) |
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(2) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(8) |
| 2010 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-04 12:11:53
|
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 ----
|
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-02 17:26:38
|
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, |
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-02 17:26:38
|
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:
|
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-02 17:26:38
|
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, |
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-02 17:26:38
|
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, |
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-02 17:25:52
|
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 |
|
From: Hans-Bernhard B. <br...@us...> - 2002-01-02 17:25:52
|
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);
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-11-22 17:38:23
|
Update of /cvsroot/cscope/cscope/src In directory usw-pr-cvs1:/tmp/cvs-serv22236/src Modified Files: build.c command.c library.h Log Message: Some compiler warnings quenched Index: build.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/build.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** build.c 2001/10/10 16:49:22 1.3 --- build.c 2001/11/22 17:38:19 1.4 *************** *** 46,49 **** --- 46,55 ---- #include "vp.h" + #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES) + #include <ncurses.h> + #else + #include <curses.h> + #endif + /* Exported variables: */ Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** command.c 2001/10/19 15:32:27 1.16 --- command.c 2001/11/22 17:38:19 1.17 *************** *** 37,40 **** --- 37,41 ---- #include "global.h" + #include "build.h" /* for rebuild() */ #include <stdlib.h> #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES) Index: library.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/library.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** library.h 2001/07/05 16:47:04 1.8 --- library.h 2001/11/22 17:38:19 1.9 *************** *** 59,63 **** * #include the relevant header, instead. Moreover, they don't seem * to be used, anyway ... */ char *regcmp(), *regex(); ! #endif /* CSCOPE_LIBRARY_H */ --- 59,64 ---- * #include the relevant header, instead. Moreover, they don't seem * to be used, anyway ... */ + #if 0 char *regcmp(), *regex(); ! #endif #endif /* CSCOPE_LIBRARY_H */ |
|
From: Hans-Bernhard B. <br...@us...> - 2001-11-22 17:38:23
|
Update of /cvsroot/cscope/cscope In directory usw-pr-cvs1:/tmp/cvs-serv22236 Modified Files: ChangeLog Log Message: Some compiler warnings quenched Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -r1.106 -r1.107 *** ChangeLog 2001/10/30 21:45:04 1.106 --- ChangeLog 2001/11/22 17:38:19 1.107 *************** *** 1,2 **** --- 1,4 ---- + (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. (2001/10/19 - broeker) Replace usages of freopen() by fclose()/fopen() pairs |
|
From: Darryl O. <da...@us...> - 2001-11-02 00:42:59
|
Update of /cvsroot/cscope/cscope/contrib/xcscope
In directory usw-pr-cvs1:/tmp/cvs-serv2121
Modified Files:
xcscope.el
Log Message:
Cursor handling tweaks in the output buffer
Index: xcscope.el
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/xcscope/xcscope.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** xcscope.el 2001/10/17 01:00:03 1.11
--- xcscope.el 2001/11/02 00:42:55 1.12
***************
*** 7,11 ****
; Author: Darryl Okahata
; Created: Wed Apr 19 17:03:38 2000
! ; Modified: Wed Jul 18 19:27:09 2001 (Darryl Okahata) da...@so...
; Language: Emacs-Lisp
; Package: N/A
--- 7,11 ----
; Author: Darryl Okahata
; Created: Wed Apr 19 17:03:38 2000
! ; Modified: Thu Nov 1 16:34:54 2001 (Darryl Okahata) da...@so...
; Language: Emacs-Lisp
; Package: N/A
***************
*** 1771,1776 ****
(save-window-excursion
(save-excursion
! (if (and (setq window (get-buffer-window buffer))
! (= (window-point window) (point-max)))
(progn
(setq update-window t)
--- 1771,1777 ----
(save-window-excursion
(save-excursion
! (if (or (and (setq window (get-buffer-window buffer))
! (= (window-point window) (point-max)))
! (= (point) (point-max)))
(progn
(setq update-window t)
***************
*** 1779,1783 ****
(let (buffer-read-only continue)
(goto-char (point-max))
! (if (= cscope-output-start (point))
(message "No matches were found."))
(if (and cscope-suppress-empty-matches
--- 1780,1784 ----
(let (buffer-read-only continue)
(goto-char (point-max))
! (if (not cscope-first-match)
(message "No matches were found."))
(if (and cscope-suppress-empty-matches
***************
*** 1820,1832 ****
(set-buffer-modified-p nil)
))
! (if (and done cscope-first-match-point)
! (if update-window
(set-window-point window cscope-first-match-point)
! (goto-char cscope-first-match-point)))
(cond
( (not done) ;; we're not done -- do nothing for now
(if update-window
! (set-window-point window (point-max))
! (goto-char (point-max)))
)
( cscope-first-match
--- 1821,1835 ----
(set-buffer-modified-p nil)
))
! (if (and done cscope-first-match-point update-window)
! (if window
(set-window-point window cscope-first-match-point)
! (goto-char cscope-first-match-point))
! )
(cond
( (not done) ;; we're not done -- do nothing for now
(if update-window
! (if window
! (set-window-point window (point-max))
! (goto-char (point-max))))
)
( cscope-first-match
***************
*** 1838,1841 ****
--- 1841,1846 ----
)
)
+ (if (and done (eq old-buffer buffer))
+ (cscope-help))
(set-buffer old-buffer)
))
|
|
From: Petr S. <pe...@us...> - 2001-10-30 21:45:07
|
Update of /cvsroot/cscope/cscope In directory usw-pr-cvs1:/tmp/cvs-serv12589 Modified Files: AUTHORS ChangeLog Log Message: Added Joe Steffen as the creator of cscope Index: AUTHORS =================================================================== RCS file: /cvsroot/cscope/cscope/AUTHORS,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** AUTHORS 2001/10/09 18:59:07 1.30 --- AUTHORS 2001/10/30 21:45:04 1.31 *************** *** 1,2 **** --- 1,3 ---- + Joe Steffen - Creator of Cscope Petr Sorfa <pe...@us...> - Maintainer Simon Cozens - autoconf setup Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -r1.105 -r1.106 *** ChangeLog 2001/10/19 15:32:24 1.105 --- ChangeLog 2001/10/30 21:45:04 1.106 *************** *** 1,2 **** --- 1,3 ---- + (2001/10/30 - petrs) Added Joe Steffen to author's list as the creator. (2001/10/19 - broeker) Replace usages of freopen() by fclose()/fopen() pairs to work around bug in some Linux libc constellation. |
|
From: Hans-Bernhard B. <br...@us...> - 2001-10-19 15:32:31
|
Update of /cvsroot/cscope/cscope In directory usw-pr-cvs1:/tmp/cvs-serv28779 Modified Files: ChangeLog Log Message: Work around some Linux' buggy freopen() Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -r1.104 -r1.105 *** ChangeLog 2001/10/10 16:47:50 1.104 --- ChangeLog 2001/10/19 15:32:24 1.105 *************** *** 1,2 **** --- 1,4 ---- + (2001/10/19 - broeker) Replace usages of freopen() by fclose()/fopen() pairs + to work around bug in some Linux libc constellation. (2001/10/10 - broeker) Remove unused argument 'name' of addsrcfile() function. Alternative buffer overflow protection scheme, using |
|
From: Hans-Bernhard B. <br...@us...> - 2001-10-19 15:32:31
|
Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv28779/src
Modified Files:
display.c command.c
Log Message:
Work around some Linux' buggy freopen()
Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** display.c 2001/08/15 13:04:14 1.18
--- display.c 2001/10/19 15:32:27 1.19
***************
*** 445,449 ****
/* append the non-global references */
! (void) freopen(temp2, "rb", nonglobalrefs);
while ((c = getc(nonglobalrefs)) != EOF) {
(void) putc(c, refsfound);
--- 445,453 ----
/* append the non-global references */
! (void) fclose(nonglobalrefs);
! if ( (nonglobalrefs = myfopen(temp2, "rb")) == NULL) {
! cannotopen(temp2);
! return(NO);
! }
while ((c = getc(nonglobalrefs)) != EOF) {
(void) putc(c, refsfound);
***************
*** 459,463 ****
/* reopen the references found file for reading */
! (void) freopen(temp1, "rb", refsfound);
nextline = 1;
totallines = 0;
--- 463,471 ----
/* reopen the references found file for reading */
! (void) fclose(refsfound);
! if ( (refsfound = myfopen(temp1, "rb")) == NULL) {
! cannotopen(temp1);
! return(NO);
! }
nextline = 1;
totallines = 0;
***************
*** 746,753 ****
return(NO);
}
! }
! else if (freopen(temp1, "wb", refsfound) == NULL) {
! postmsg("Cannot reopen temporary file");
! return(NO);
}
return(YES);
--- 754,763 ----
return(NO);
}
! } else {
! (void) fclose(refsfound);
! if ( (refsfound = myfopen(temp1, "wb")) == NULL) {
! postmsg("Cannot reopen temporary file");
! return(NO);
! }
}
return(YES);
Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** command.c 2001/08/15 13:04:14 1.15
--- command.c 2001/10/19 15:32:27 1.16
***************
*** 570,574 ****
}
(void) fclose(file);
! (void) freopen(temp1, "rb", refsfound);
countrefs();
}
--- 570,578 ----
}
(void) fclose(file);
! (void) fclose(refsfound);
! if ( (refsfound = myfopen(temp1, "rb")) == NULL) {
! cannotopen(temp1);
! return(NO);
! }
countrefs();
}
|
|
From: Darryl O. <da...@us...> - 2001-10-17 01:00:12
|
Update of /cvsroot/cscope/cscope/contrib/xcscope In directory usw-pr-cvs1:/tmp/cvs-serv18572 Modified Files: xcscope.el Log Message: Trivial doc fix. Index: xcscope.el =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/xcscope/xcscope.el,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** xcscope.el 2001/10/16 18:04:33 1.10 --- xcscope.el 2001/10/17 01:00:03 1.11 *************** *** 187,196 **** ;; use. For example, consider a project that contains the following ;; cscope database directories: ! ;; /users/jdoe/sources ! ;; /users/jdoe/sources/proj1 ! ;; /users/jdoe/sources/proj2 ;; If a search is initiated from a .c file in /users/jdoe/sources/proj1 ;; then (assuming the variable, `cscope-database-regexps', is not set) ! ;; /usr/src/a_proj/sub1 will be used as the cscope data base directory. ;; Only matches in files in /users/jdoe/sources/proj1 will be found. This ;; can be remedied by typing "C-c s a" and then "M-del" to remove single --- 187,198 ---- ;; use. For example, consider a project that contains the following ;; cscope database directories: ! ;; ! ;; /users/jdoe/sources ! ;; /users/jdoe/sources/proj1 ! ;; /users/jdoe/sources/proj2 ! ;; ;; If a search is initiated from a .c file in /users/jdoe/sources/proj1 ;; then (assuming the variable, `cscope-database-regexps', is not set) ! ;; /users/jdoe/sources/proj1 will be used as the cscope data base directory. ;; Only matches in files in /users/jdoe/sources/proj1 will be found. This ;; can be remedied by typing "C-c s a" and then "M-del" to remove single |
|
From: Darryl O. <da...@us...> - 2001-10-16 18:04:36
|
Update of /cvsroot/cscope/cscope/contrib/xcscope
In directory usw-pr-cvs1:/tmp/cvs-serv21260
Modified Files:
xcscope.el
Log Message:
Commit for most of Steven Elliott's <sel...@au...> changes
Index: xcscope.el
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/xcscope/xcscope.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** xcscope.el 2001/06/28 22:15:00 1.9
--- xcscope.el 2001/10/16 18:04:33 1.10
***************
*** 7,19 ****
; Author: Darryl Okahata
; Created: Wed Apr 19 17:03:38 2000
! ; Modified: Thu Jun 28 15:10:40 2001 (Darryl Okahata) da...@so...
; Language: Emacs-Lisp
; Package: N/A
; Status: Experimental
;
! ; (C) Copyright 2000, 2001, Darryl Okahata, all rights reserved.
; GNU Emacs enhancements (C) Copyright 2001,
; Triet H. Lai <th...@ma...>
! ; Fuzzy matching code (C) Copyright 2001,
; Steven Elliott <sel...@au...>
;
--- 7,20 ----
; Author: Darryl Okahata
; Created: Wed Apr 19 17:03:38 2000
! ; Modified: Wed Jul 18 19:27:09 2001 (Darryl Okahata) da...@so...
; Language: Emacs-Lisp
; Package: N/A
; Status: Experimental
;
! ; (C) Copyright 2000, 2001, Darryl Okahata <da...@so...>,
! ; all rights reserved.
; GNU Emacs enhancements (C) Copyright 2001,
; Triet H. Lai <th...@ma...>
! ; Fuzzy matching and navigation code (C) Copyright 2001,
; Steven Elliott <sel...@au...>
;
***************
*** 95,101 ****
;; (require 'xcscope)
;;
! ;; 5. Restart (X)Emacs. That's it.
;;
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
--- 96,121 ----
;; (require 'xcscope)
;;
! ;; 5. If you intend to use xcscope.el often you can optionally edit your
! ;; ~/.emacs file to add keybindings that reduce the number of keystrokes
! ;; required. For example, the following will add "C-f#" keybindings, which
! ;; are easier to type than the usual "C-c s" prefixed keybindings. Note
! ;; that specifying "global-map" instead of "cscope:map" makes the
! ;; keybindings available in all buffers:
! ;;
! ;; (define-key global-map [(control f3)] 'cscope-set-initial-directory)
! ;; (define-key global-map [(control f4)] 'cscope-unset-initial-directory)
! ;; (define-key global-map [(control f5)] 'cscope-find-this-symbol)
! ;; (define-key global-map [(control f6)] 'cscope-find-global-definition)
! ;; (define-key global-map [(control f7)]
! ;; 'cscope-find-global-definition-no-prompting)
! ;; (define-key global-map [(control f8)] 'cscope-pop-mark)
! ;; (define-key global-map [(control f9)] 'cscope-next-symbol)
! ;; (define-key global-map [(control f10)] 'cscope-next-file)
! ;; (define-key global-map [(control f11)] 'cscope-prev-symbol)
! ;; (define-key global-map [(control f12)] 'cscope-prev-file)
;;
+ ;; 6. Restart (X)Emacs. That's it.
;;
+ ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
***************
*** 133,142 ****
;;
;; This module will first use the variable, `cscope-database-regexps',
! ;; to search for a suitable database directory. If a database
! ;; location cannot be found using this variable, then the current
! ;; directory is searched, then the parent, then the parent's parent,
! ;; etc. until a cscope database directory is found, or the root
! ;; directory is reached. If the root directory is reached, the
! ;; current directory will be used.
;;
;; A cscope database directory is one in which EITHER a cscope database
--- 153,164 ----
;;
;; This module will first use the variable, `cscope-database-regexps',
! ;; to search for a suitable database directory. If a database location
! ;; cannot be found using this variable then a search is begun at the
! ;; variable, `cscope-initial-directory', if set, or the current
! ;; directory otherwise. If the directory is not a cscope database
! ;; directory then the directory's parent, parent's parent, etc. is
! ;; searched until a cscope database directory is found, or the root
! ;; directory is reached. If the root directory is reached, the current
! ;; directory will be used.
;;
;; A cscope database directory is one in which EITHER a cscope database
***************
*** 158,162 ****
;; variable is when you want to share the database file with other
;; users; in this case, the database may be located in a directory
! ;; separate from the source files.
;;
;;
--- 180,200 ----
;; variable is when you want to share the database file with other
;; users; in this case, the database may be located in a directory
! ;; separate from the source files.
! ;;
! ;; Setting the variable, `cscope-initial-directory', is useful when a
! ;; search is to be expanded by specifying a cscope database directory
! ;; that is a parent of the directory that this module would otherwise
! ;; use. For example, consider a project that contains the following
! ;; cscope database directories:
! ;; /users/jdoe/sources
! ;; /users/jdoe/sources/proj1
! ;; /users/jdoe/sources/proj2
! ;; If a search is initiated from a .c file in /users/jdoe/sources/proj1
! ;; then (assuming the variable, `cscope-database-regexps', is not set)
! ;; /usr/src/a_proj/sub1 will be used as the cscope data base directory.
! ;; Only matches in files in /users/jdoe/sources/proj1 will be found. This
! ;; can be remedied by typing "C-c s a" and then "M-del" to remove single
! ;; path element in order to use a cscope database directory of
! ;; /users/jdoe/sources. Normal searching can be restored by typing "C-c s A".
;;
;;
***************
*** 169,172 ****
--- 207,211 ----
;; C-c s d Find global definition.
;; C-c s g Find global definition (alternate binding).
+ ;; C-c s G Find global definition without prompting.
;; C-c s c Find functions calling a function.
;; C-c s C Find called functions (list functions called
***************
*** 176,181 ****
;; C-c s f Find a file.
;; C-c s i Find files #including a file.
;;
! ;; These pertain to cscope database maintanance:
;;
;; C-c s L Create list of files to index.
--- 215,235 ----
;; C-c s f Find a file.
;; C-c s i Find files #including a file.
+ ;;
+ ;; These pertain to navigation through the search results:
+ ;;
+ ;; C-c s n Next symbol.
+ ;; C-c s N Next file.
+ ;; C-c s p Previous symbol.
+ ;; C-c s P Previous file.
+ ;; C-c s u Pop mark.
+ ;;
+ ;; These pertain to setting and unsetting the variable,
+ ;; `cscope-initial-directory', (location searched for the cscope database
+ ;; directory):
+ ;;
+ ;; C-c s a Set initial directory.
+ ;; C-c s A Unset initial directory.
;;
! ;; These pertain to cscope database maintenance:
;;
;; C-c s L Create list of files to index.
***************
*** 308,311 ****
--- 362,370 ----
;; maintenance.
;;
+ ;; "cscope-display-cscope-buffer"
+ ;; If non-nil, display the *cscope* buffer after each search
+ ;; (default). This variable can be set in order to reduce the
+ ;; number of keystrokes required to navigate through the matches.
+ ;;
;; "cscope-database-regexps"
;; List to force directory-to-cscope-database mappings.
***************
*** 675,678 ****
--- 734,743 ----
+ (defcustom cscope-display-cscope-buffer t
+ "*If non-nil automatically display the *cscope* buffer after each search."
+ :type 'boolean
+ :group 'cscope)
+
+
(defcustom cscope-stop-at-first-match-dir nil
"*If non-nil, stop searching through multiple databases if a match is found.
***************
*** 840,843 ****
--- 905,909 ----
(setq cscope-list-entry-keymap (make-keymap))
(suppress-keymap cscope-list-entry-keymap)
+ ;; The following section does not appear in the "Cscope" menu.
(if cscope-running-in-xemacs
(define-key cscope-list-entry-keymap [button2] 'cscope-mouse-select-entry-other-window)
***************
*** 846,857 ****
(define-key cscope-list-entry-keymap " " 'cscope-show-entry-other-window)
(define-key cscope-list-entry-keymap "o" 'cscope-select-entry-one-window)
- (define-key cscope-list-entry-keymap "n" 'cscope-show-next-entry-other-window)
- (define-key cscope-list-entry-keymap "p" 'cscope-show-prev-entry-other-window)
(define-key cscope-list-entry-keymap "q" 'cscope-bury-buffer)
(define-key cscope-list-entry-keymap "Q" 'cscope-quit)
(define-key cscope-list-entry-keymap "h" 'cscope-help)
(define-key cscope-list-entry-keymap "?" 'cscope-help)
(define-key cscope-list-entry-keymap "s" 'cscope-find-this-symbol)
(define-key cscope-list-entry-keymap "g" 'cscope-find-global-definition)
(define-key cscope-list-entry-keymap "c" 'cscope-find-functions-calling-this-function)
(define-key cscope-list-entry-keymap "C" 'cscope-find-called-functions)
--- 912,925 ----
(define-key cscope-list-entry-keymap " " 'cscope-show-entry-other-window)
(define-key cscope-list-entry-keymap "o" 'cscope-select-entry-one-window)
(define-key cscope-list-entry-keymap "q" 'cscope-bury-buffer)
(define-key cscope-list-entry-keymap "Q" 'cscope-quit)
(define-key cscope-list-entry-keymap "h" 'cscope-help)
(define-key cscope-list-entry-keymap "?" 'cscope-help)
+ ;; The following line corresponds to be beginning of the "Cscope" menu.
(define-key cscope-list-entry-keymap "s" 'cscope-find-this-symbol)
+ (define-key cscope-list-entry-keymap "d" 'cscope-find-this-symbol)
(define-key cscope-list-entry-keymap "g" 'cscope-find-global-definition)
+ (define-key cscope-list-entry-keymap "G"
+ 'cscope-find-global-definition-no-prompting)
(define-key cscope-list-entry-keymap "c" 'cscope-find-functions-calling-this-function)
(define-key cscope-list-entry-keymap "C" 'cscope-find-called-functions)
***************
*** 859,862 ****
--- 927,941 ----
(define-key cscope-list-entry-keymap "e" 'cscope-find-egrep-pattern)
(define-key cscope-list-entry-keymap "f" 'cscope-find-this-file)
+ (define-key cscope-list-entry-keymap "i" 'cscope-find-files-including-file)
+ ;; --- (The '---' indicates that this line corresponds to a menu separator.)
+ (define-key cscope-list-entry-keymap "n" 'cscope-next-symbol)
+ (define-key cscope-list-entry-keymap "N" 'cscope-next-file)
+ (define-key cscope-list-entry-keymap "p" 'cscope-prev-symbol)
+ (define-key cscope-list-entry-keymap "P" 'cscope-prev-file)
+ (define-key cscope-list-entry-keymap "u" 'cscope-pop-mark)
+ ;; ---
+ (define-key cscope-list-entry-keymap "a" 'cscope-set-initial-directory)
+ (define-key cscope-list-entry-keymap "A" 'cscope-unset-initial-directory)
+ ;; ---
(define-key cscope-list-entry-keymap "L" 'cscope-create-list-of-files-to-index)
(define-key cscope-list-entry-keymap "I" 'cscope-index-files)
***************
*** 866,869 ****
--- 945,949 ----
(define-key cscope-list-entry-keymap "T" 'cscope-tell-user-about-directory)
(define-key cscope-list-entry-keymap "D" 'cscope-dired-directory)
+ ;; The previous line corresponds to be end of the "Cscope" menu.
)
***************
*** 983,993 ****
--- 1063,1099 ----
(make-variable-buffer-local 'cscope-stop-at-first-match-dir-meta)
+
(defvar cscope-symbol nil
"The last symbol searched for.")
+
(defvar cscope-adjust-range 1000
"How far the point should be adjusted if the symbol is not on the line
specified by the cscope database.")
+
+ (defvar cscope-marker nil
+ "The location from which cscope was invoked.")
+
+
+ (defvar cscope-marker-window nil
+ "The window which should contain cscope-marker. This is the window from
+ which cscope-marker is set when searches are launched from the *cscope*
+ buffer.")
+
+
+ (defvar cscope-marker-ring-length 16
+ "Length of the cscope marker ring.")
+
+
+ (defvar cscope-marker-ring (make-ring cscope-marker-ring-length)
+ "Ring of markers which are locations from which cscope was invoked.")
+
+
+ (defvar cscope-initial-directory nil
+ "When set the directory in which searches for the cscope database
+ directory should begin.")
+
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 997,1003 ****
--- 1103,1111 ----
nil
(setq cscope:map (make-sparse-keymap))
+ ;; The following line corresponds to be beginning of the "Cscope" menu.
(define-key cscope:map "\C-css" 'cscope-find-this-symbol)
(define-key cscope:map "\C-csd" 'cscope-find-global-definition)
(define-key cscope:map "\C-csg" 'cscope-find-global-definition)
+ (define-key cscope:map "\C-csG" 'cscope-find-global-definition-no-prompting)
(define-key cscope:map "\C-csc" 'cscope-find-functions-calling-this-function)
(define-key cscope:map "\C-csC" 'cscope-find-called-functions)
***************
*** 1006,1010 ****
(define-key cscope:map "\C-csf" 'cscope-find-this-file)
(define-key cscope:map "\C-csi" 'cscope-find-files-including-file)
! ;;
(define-key cscope:map "\C-csL" 'cscope-create-list-of-files-to-index)
(define-key cscope:map "\C-csI" 'cscope-index-files)
--- 1114,1127 ----
(define-key cscope:map "\C-csf" 'cscope-find-this-file)
(define-key cscope:map "\C-csi" 'cscope-find-files-including-file)
! ;; --- (The '---' indicates that this line corresponds to a menu separator.)
! (define-key cscope:map "\C-csn" 'cscope-next-symbol)
! (define-key cscope:map "\C-csN" 'cscope-next-file)
! (define-key cscope:map "\C-csp" 'cscope-prev-symbol)
! (define-key cscope:map "\C-csP" 'cscope-prev-file)
! (define-key cscope:map "\C-csu" 'cscope-pop-mark)
! ;; ---
! (define-key cscope:map "\C-csa" 'cscope-set-initial-directory)
! (define-key cscope:map "\C-csA" 'cscope-unset-initial-directory)
! ;; ---
(define-key cscope:map "\C-csL" 'cscope-create-list-of-files-to-index)
(define-key cscope:map "\C-csI" 'cscope-index-files)
***************
*** 1014,1017 ****
--- 1131,1135 ----
(define-key cscope:map "\C-csT" 'cscope-tell-user-about-directory)
(define-key cscope:map "\C-csD" 'cscope-dired-directory))
+ ;; The previous line corresponds to be end of the "Cscope" menu.
(easy-menu-define cscope:menu
***************
*** 1021,1027 ****
[ "Find symbol" cscope-find-this-symbol t ]
[ "Find global definition" cscope-find-global-definition t ]
! [ "Find called functions" cscope-find-called-functions t ]
[ "Find functions calling a function"
cscope-find-functions-calling-this-function t ]
[ "Find text string" cscope-find-this-text-string t ]
[ "Find egrep pattern" cscope-find-egrep-pattern t ]
--- 1139,1147 ----
[ "Find symbol" cscope-find-this-symbol t ]
[ "Find global definition" cscope-find-global-definition t ]
! [ "Find global definition no prompting"
! cscope-find-global-definition-no-prompting t ]
[ "Find functions calling a function"
cscope-find-functions-calling-this-function t ]
+ [ "Find called functions" cscope-find-called-functions t ]
[ "Find text string" cscope-find-this-text-string t ]
[ "Find egrep pattern" cscope-find-egrep-pattern t ]
***************
*** 1030,1033 ****
--- 1150,1163 ----
cscope-find-files-including-file t ]
"-----------"
+ [ "Next symbol" cscope-next-symbol t ]
+ [ "Next file" cscope-next-file t ]
+ [ "Previous symbol" cscope-prev-symbol t ]
+ [ "Previous file" cscope-prev-file t ]
+ [ "Pop mark" cscope-pop-mark t ]
+ "-----------"
+ [ "Set initial directory" cscope-set-initial-directory t ]
+ [ "Unset initial directory"
+ cscope-unset-initial-directory t ]
+ "-----------"
[ "Create list of files to index"
cscope-create-list-of-files-to-index t ]
***************
*** 1044,1047 ****
--- 1174,1181 ----
(not cscope-edit-single-match))
:style toggle :selected cscope-edit-single-match ]
+ [ "Auto display *cscope* buffer"
+ (setq cscope-display-cscope-buffer
+ (not cscope-display-cscope-buffer))
+ :style toggle :selected cscope-display-cscope-buffer ]
[ "Stop at first matching database"
(setq cscope-stop-at-first-match-dir
***************
*** 1131,1135 ****
(progn
(unless (file-readable-p file)
! (error "%s is not readable or exists." file))
(setq buffer (find-file-noselect file))
(if (windowp window)
--- 1265,1269 ----
(progn
(unless (file-readable-p file)
! (error "%s is not readable or exists" file))
(setq buffer (find-file-noselect file))
(if (windowp window)
***************
*** 1190,1193 ****
--- 1324,1337 ----
(push-mark old-pos))
))
+
+ (if cscope-marker
+ (progn ;; The search was successful. Save the marker so it
+ ;; can be returned to by cscope-pop-mark.
+ (ring-insert cscope-marker-ring cscope-marker)
+ ;; Unset cscope-marker so that moving between matches
+ ;; (cscope-next-symbol, etc.) does not fill
+ ;; cscope-marker-ring.
+ (setq cscope-marker nil)))
+ (setq cscope-marker-window window)
)
(message "No entry found at point."))
***************
*** 1229,1232 ****
--- 1373,1387 ----
+ (defun cscope-select-entry-specified-window (window)
+ "Display the entry at point in a specified window, select the window."
+ (interactive)
+ (let ((file (get-text-property (point) 'cscope-file))
+ (line-number (get-text-property (point) 'cscope-line-number)))
+ (setq window (cscope-show-entry-internal file line-number t window))
+ (if (windowp window)
+ (select-window window))
+ ))
+
+
(defun cscope-mouse-select-entry-other-window (event)
"Display the entry over which the mouse event occurred, select the window."
***************
*** 1253,1280 ****
! (defun cscope-show-next-entry-other-window ()
! "Display the next entry line in other window.
! Point is not saved on mark ring."
! (interactive)
! (let (file line-number)
! (forward-line)
! (setq file (get-text-property (point) 'cscope-file)
! line-number (get-text-property (point) 'cscope-line-number))
! (cscope-show-entry-internal file line-number nil nil t)
))
! (defun cscope-show-prev-entry-other-window ()
! "Display the previous entry line in other window.
! Point is not saved on mark ring."
(interactive)
! (let (file line-number)
! (forward-line -1)
! (setq file (get-text-property (point) 'cscope-file)
! line-number (get-text-property (point) 'cscope-line-number))
! (cscope-show-entry-internal file line-number nil nil t)
! ))
(defun cscope-help ()
(interactive)
--- 1408,1524 ----
! (defun cscope-buffer-search (do-symbol do-next)
! "The body of the following four functions."
! (let* (line-number old-point point
! (search-file (not do-symbol))
! (search-prev (not do-next))
! (direction (if do-next 1 -1))
! (old-buffer (current-buffer))
! (old-buffer-window (get-buffer-window old-buffer))
! (buffer (get-buffer cscope-output-buffer-name))
! (buffer-window (get-buffer-window (or buffer (error "The *cscope* buffer does not exist yet"))))
! )
! (set-buffer buffer)
! (setq old-point (point))
! (forward-line direction)
! (setq point (point))
! (setq line-number (get-text-property point 'cscope-line-number))
! (while (or (not line-number)
! (or (and do-symbol (= line-number -1))
! (and search-file (/= line-number -1))))
! (forward-line direction)
! (setq point (point))
! (if (or (and do-next (>= point (point-max)))
! (and search-prev (<= point (point-min))))
! (progn
! (goto-char old-point)
! (error "The %s of the *cscope* buffer has been reached"
! (if do-next "end" "beginning"))))
! (setq line-number (get-text-property point 'cscope-line-number)))
! (if (eq old-buffer buffer) ;; In the *cscope* buffer.
! (cscope-show-entry-other-window)
! (cscope-select-entry-specified-window old-buffer-window) ;; else
! (if (windowp buffer-window)
! (set-window-point buffer-window point)))
! (set-buffer old-buffer)
))
! (defun cscope-next-symbol ()
! "Move to the next symbol in the *cscope* buffer."
(interactive)
! (cscope-buffer-search t t))
!
!
! (defun cscope-next-file ()
! "Move to the next file in the *cscope* buffer."
! (interactive)
! (cscope-buffer-search nil t))
!
!
! (defun cscope-prev-symbol ()
! "Move to the previous symbol in the *cscope* buffer."
! (interactive)
! (cscope-buffer-search t nil))
!
!
! (defun cscope-prev-file ()
! "Move to the previous file in the *cscope* buffer."
! (interactive)
! (cscope-buffer-search nil nil))
!
!
! (defun cscope-pop-mark ()
! "Pop back to where cscope was last invoked."
! (interactive)
+ ;; This function is based on pop-tag-mark, which can be found in
+ ;; lisp/progmodes/etags.el.
+ (if (ring-empty-p cscope-marker-ring)
+ (error "There are no marked buffers in the cscope-marker-ring yet"))
+ (let* ( (marker (ring-remove cscope-marker-ring 0))
+ (old-buffer (current-buffer))
+ (marker-buffer (marker-buffer marker))
+ marker-window
+ (marker-point (marker-position marker))
+ (cscope-buffer (get-buffer cscope-output-buffer-name)) )
+
+ ;; After the following both cscope-marker-ring and cscope-marker will be
+ ;; in the state they were immediately after the last search. This way if
+ ;; the user now makes a selection in the previously generated *cscope*
+ ;; buffer things will behave the same way as if that selection had been
+ ;; made immediately after the last search.
+ (setq cscope-marker marker)
+
+ (if marker-buffer
+ (if (eq old-buffer cscope-buffer)
+ (progn ;; In the *cscope* buffer.
+ (set-buffer marker-buffer)
+ (setq marker-window (display-buffer marker-buffer))
+ (set-window-point marker-window marker-point)
+ (select-window marker-window))
+ (switch-to-buffer marker-buffer))
+ (error "The marked buffer has been deleted"))
+ (goto-char marker-point)
+ (set-buffer old-buffer)))
+
+
+ (defun cscope-set-initial-directory (cs-id)
+ "Set the cscope-initial-directory variable. The
+ cscope-initial-directory variable, when set, specifies the directory
+ where searches for the cscope database directory should begin. This
+ overrides the current directory, which would otherwise be used."
+ (interactive "DCscope Initial Directory: ")
+ (setq cscope-initial-directory cs-id))
+
+
+ (defun cscope-unset-initial-directory ()
+ "Unset the cscope-initial-directory variable."
+ (interactive)
+ (setq cscope-initial-directory nil)
+ (message "The cscope-initial-directory variable is now unset."))
+
+
(defun cscope-help ()
(interactive)
***************
*** 1353,1357 ****
the current directory will be used."
(let (info regexps dir-regexp this-directory)
! (setq top-directory (cscope-canonicalize-directory top-directory))
(catch 'done
;; Try searching using `cscope-database-regexps' ...
--- 1597,1602 ----
the current directory will be used."
(let (info regexps dir-regexp this-directory)
! (setq top-directory (cscope-canonicalize-directory
! (or top-directory cscope-initial-directory)))
(catch 'done
;; Try searching using `cscope-database-regexps' ...
***************
*** 1518,1526 ****
(defun cscope-process-sentinel (process event)
"Sentinel for when the cscope process dies."
! (let ( buffer window update-window (done t) )
(save-window-excursion
(save-excursion
- (setq buffer (process-buffer process))
- (set-buffer buffer)
(if (and (setq window (get-buffer-window buffer))
(= (window-point window) (point-max)))
--- 1763,1772 ----
(defun cscope-process-sentinel (process event)
"Sentinel for when the cscope process dies."
! (let* ( (buffer (process-buffer process)) window update-window
! (done t) (old-buffer (current-buffer))
! (old-buffer-window (get-buffer-window old-buffer)) )
! (set-buffer buffer)
(save-window-excursion
(save-excursion
(if (and (setq window (get-buffer-window buffer))
(= (window-point window) (point-max)))
***************
*** 1531,1534 ****
--- 1777,1782 ----
(let (buffer-read-only continue)
(goto-char (point-max))
+ (if (= cscope-output-start (point))
+ (message "No matches were found."))
(if (and cscope-suppress-empty-matches
(= cscope-output-start (point)))
***************
*** 1570,1587 ****
(set-buffer-modified-p nil)
))
(cond
( (not done) ;; we're not done -- do nothing for now
(if update-window
! (set-window-point window (point-max)))
)
! ( (and cscope-edit-single-match cscope-first-match
! (not cscope-matched-multiple))
! (progn
! (cscope-show-entry-internal (car cscope-first-match)
! (cdr cscope-first-match) t)
! ))
! ( (and update-window cscope-first-match-point)
! (set-window-point window cscope-first-match-point))
)
))
--- 1818,1840 ----
(set-buffer-modified-p nil)
))
+ (if (and done cscope-first-match-point)
+ (if update-window
+ (set-window-point window cscope-first-match-point)
+ (goto-char cscope-first-match-point)))
(cond
( (not done) ;; we're not done -- do nothing for now
(if update-window
! (set-window-point window (point-max))
! (goto-char (point-max)))
)
! ( cscope-first-match
! (if cscope-display-cscope-buffer
! (if (and cscope-edit-single-match (not cscope-matched-multiple))
! (cscope-show-entry-internal (car cscope-first-match)
! (cdr cscope-first-match) t))
! (cscope-select-entry-specified-window old-buffer-window))
! )
)
+ (set-buffer old-buffer)
))
***************
*** 1699,1706 ****
necessarily), if different that the current one. FILTER-FUNC and
SENTINEL-FUNC are optional process filter and sentinel, respectively."
! (let ( (outbuf (get-buffer-create cscope-output-buffer-name)) )
(if cscope-process
(error "A cscope search is still in progress -- only one at a time is allowed"))
! (setq directory (cscope-canonicalize-directory directory))
(save-excursion
(set-buffer outbuf)
--- 1952,1975 ----
necessarily), if different that the current one. FILTER-FUNC and
SENTINEL-FUNC are optional process filter and sentinel, respectively."
! (let ( (outbuf (get-buffer-create cscope-output-buffer-name))
! (old-buffer (current-buffer)) )
(if cscope-process
(error "A cscope search is still in progress -- only one at a time is allowed"))
! (setq directory (cscope-canonicalize-directory
! (or cscope-initial-directory directory)))
! (if (eq outbuf old-buffer) ;; In the *cscope* buffer.
! (if cscope-marker-window
! (progn
! ;; Assume that cscope-marker-window is the window, from the
! ;; users perspective, from which the search was launched and the
! ;; window that should be returned to upon cscope-pop-mark.
! (set-buffer (window-buffer cscope-marker-window))
! (setq cscope-marker (point-marker))
! (set-buffer old-buffer)))
! (progn ;; Not in the *cscope buffer.
! ;; Set the cscope-marker-window to whichever window this search
! ;; was launched from.
! (setq cscope-marker-window (get-buffer-window old-buffer))
! (setq cscope-marker (point-marker))))
(save-excursion
(set-buffer outbuf)
***************
*** 1728,1735 ****
(cscope-search-one-database)
)
! (pop-to-buffer outbuf)
(goto-char (point-max))
(cscope-list-entry-mode)
- (cscope-help)
))
--- 1997,2007 ----
(cscope-search-one-database)
)
! (if cscope-display-cscope-buffer
! (progn
! (pop-to-buffer outbuf)
! (cscope-help))
! (set-buffer outbuf))
(goto-char (point-max))
(cscope-list-entry-mode)
))
***************
*** 1989,1992 ****
--- 2261,2275 ----
))
(let ()
+ (setq cscope-symbol symbol)
+ (cscope-call (format "Finding global definition: %s" symbol)
+ (list "-1" symbol) nil 'cscope-process-filter
+ 'cscope-process-sentinel)
+ ))
+
+
+ (defun cscope-find-global-definition-no-prompting ()
+ "Find a symbol's global definition without prompting."
+ (interactive)
+ (let ( (symbol (cscope-extract-symbol-at-cursor nil)) )
(setq cscope-symbol symbol)
(cscope-call (format "Finding global definition: %s" symbol)
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-10-10 16:49:25
|
Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv9796
Modified Files:
build.c global.h main.c
Log Message:
Removed unused argument of addsrcfile() function.
Index: build.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/build.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** build.c 2001/07/09 14:58:25 1.2
--- build.c 2001/10/10 16:49:22 1.3
***************
*** 297,301 ****
/* so get the list of included files */
while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) {
! addsrcfile(mybasename(oldname), oldname);
}
(void) fclose(oldrefs);
--- 297,301 ----
/* so get the list of included files */
while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) {
! addsrcfile(oldname);
}
(void) fclose(oldrefs);
Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** global.h 2001/07/09 14:00:25 1.18
--- global.h 2001/10/10 16:49:22 1.19
***************
*** 270,274 ****
void addcmd(int f, char *s);
! void addsrcfile(char *name, char *path);
void askforchar(void);
void askforreturn(void);
--- 270,274 ----
void addcmd(int f, char *s);
! void addsrcfile(char *path);
void askforchar(void);
void askforreturn(void);
Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** main.c 2001/07/09 14:58:25 1.25
--- main.c 2001/10/10 16:49:22 1.26
***************
*** 609,613 ****
if (infilelist(path) == NO &&
(s = inviewpath(path)) != NULL) {
! addsrcfile(path, s);
}
(void) putchar('\n');
--- 609,613 ----
if (infilelist(path) == NO &&
(s = inviewpath(path)) != NULL) {
! addsrcfile(s);
}
(void) putchar('\n');
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-10-10 16:47:53
|
Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv9281
Modified Files:
ChangeLog
Log Message:
sprintf("%.*s") style buffer overflow safeguards.
Remove unused argument of addsrcfile().
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** ChangeLog 2001/10/09 18:59:07 1.103
--- ChangeLog 2001/10/10 16:47:50 1.104
***************
*** 1,2 ****
--- 1,6 ----
+ (2001/10/10 - broeker) Remove unused argument 'name' of addsrcfile() function.
+ Alternative buffer overflow protection scheme, using
+ "%.*s" format specifiers in ordinary sprintf(); now used
+ throughout dir.c.
(2001/10/09 - valentin) Prevention of a possible buffer overflow.
(2001/09/27 - broeker) Added autoconf test to use Cygwin's separate
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-10-10 16:47:24
|
Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv9136
Modified Files:
dir.c
Log Message:
sprintf("%.*s") style buffer overflow safeguards.
Remove unused argument of addsrcfile().
Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** dir.c 2001/10/09 18:59:07 1.13
--- dir.c 2001/10/10 16:47:20 1.14
***************
*** 130,133 ****
--- 130,135 ----
dir = strtok(dirlist, DIRSEPS);
while (dir != NULL) {
+ int dir_len = strlen(dir);
+
addsrcdir(dir);
***************
*** 138,142 ****
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) sprintf(path, "%s/%s", srcdirs[i], dir);
addsrcdir(path);
}
--- 140,146 ----
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) sprintf(path, "%.*s/%s",
! PATHLEN - 2 - dir_len,
! srcdirs[i], dir);
addsrcdir(path);
}
***************
*** 194,197 ****
--- 198,203 ----
dir = strtok(dirlist, DIRSEPS);
while (dir != NULL) {
+ int dir_len = strlen(dir);
+
addincdir(dir, dir);
***************
*** 202,207 ****
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) snprintf(path, PATHLEN+1,
! "%s/%s", srcdirs[i], dir);
addincdir(dir, path);
}
--- 208,214 ----
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) sprintf(path, "%.*s/%s",
! PATHLEN - 2 - dir_len,
! srcdirs[i], dir);
addincdir(dir, path);
}
***************
*** 277,281 ****
if (infilelist(file) == NO) {
if ((s = inviewpath(file)) != NULL) {
! addsrcfile(file, s);
}
else {
--- 284,288 ----
if (infilelist(file) == NO) {
if ((s = inviewpath(file)) != NULL) {
! addsrcfile(s);
}
else {
***************
*** 346,350 ****
}
else if ((s = inviewpath(path)) != NULL) {
! addsrcfile(path, s);
}
else {
--- 353,357 ----
}
else if ((s = inviewpath(path)) != NULL) {
! addsrcfile(s);
}
else {
***************
*** 369,392 ****
/* scan a directory (recursively?) for source files */
static void
! scan_dir(const char *adir, BOOL recurse_dir) {
! DIR *dirfile;
! if( (dirfile = opendir(adir)) != NULL ) {
struct dirent *entry;
char path[PATHLEN + 1];
char *file;
! while( (entry = readdir(dirfile)) != NULL ) {
! if( (strcmp(".",entry->d_name) != 0)
! && (strcmp("..",entry->d_name) != 0) ) {
struct stat buf;
! sprintf(path,"%s/%s",adir,entry->d_name);
! if(lstat(path,&buf) == 0) {
file = entry->d_name;
! if( recurse_dir
&& (buf.st_mode & S_IFDIR) ) {
! scan_dir(path, recurse_dir);
}
else if (
--- 376,405 ----
/* scan a directory (recursively?) for source files */
static void
! scan_dir(const char *adir, BOOL recurse_dir)
! {
! DIR *dirfile;
! int adir_len = strlen(adir);
! /* FIXME: no guards against adir_len > PATHLEN, yet */
!
! if ((dirfile = opendir(adir)) != NULL) {
struct dirent *entry;
char path[PATHLEN + 1];
char *file;
! while ((entry = readdir(dirfile)) != NULL) {
! if ((strcmp(".",entry->d_name) != 0)
! && (strcmp("..",entry->d_name) != 0)) {
struct stat buf;
! sprintf(path,"%s/%.*s", adir,
! PATHLEN - 2 - adir_len,
! entry->d_name);
! if (lstat(path,&buf) == 0) {
file = entry->d_name;
! if (recurse_dir
&& (buf.st_mode & S_IFDIR) ) {
! scan_dir(path, recurse_dir);
}
else if (
***************
*** 398,402 ****
&& issrcfile(path)
&& infilelist(path) == NO) {
! addsrcfile(file, path);
}
}
--- 411,415 ----
&& issrcfile(path)
&& infilelist(path) == NO) {
! addsrcfile(path);
}
}
***************
*** 488,506 ****
/* look in current directory if it was #include "file" */
if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
! addsrcfile(file, s);
}
else {
/* search for the file in the #include directory list */
for (i = 0; i < nincdirs; ++i) {
/* don't include the file from two directories */
! (void) sprintf(name, "%s/%s", incnames[i], file);
if (infilelist(name) == YES) {
break;
}
/* make sure it exists and is readable */
! (void) sprintf(path, "%s/%s", incdirs[i], file);
if (access(compath(path), READ) == 0) {
! addsrcfile(name, path);
break;
}
--- 501,525 ----
/* look in current directory if it was #include "file" */
if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
! addsrcfile(s);
}
else {
+ int file_len = strlen(file);
+
/* search for the file in the #include directory list */
for (i = 0; i < nincdirs; ++i) {
/* don't include the file from two directories */
! (void) sprintf(name, "%.*s/%s",
! PATHLEN - 2 - file_len, incnames[i],
! file);
if (infilelist(name) == YES) {
break;
}
/* make sure it exists and is readable */
! (void) sprintf(path, "%.*s/%s",
! PATHLEN - 2 - file_len, incdirs[i],
! file);
if (access(compath(path), READ) == 0) {
! addsrcfile(path);
break;
}
***************
*** 538,545 ****
/* if it isn't a full path name and there is a multi-directory view path */
if (*file != '/' && vpndirs > 1) {
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) sprintf(path, "%s/%s", srcdirs[i], file);
if (access(compath(path), READ) == 0) {
return(path);
--- 557,567 ----
/* if it isn't a full path name and there is a multi-directory view path */
if (*file != '/' && vpndirs > 1) {
+ int file_len = strlen(file);
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) sprintf(path, "%.*s/%s",
! PATHLEN - 2 - file_len, srcdirs[i],
! file);
if (access(compath(path), READ) == 0) {
return(path);
***************
*** 552,562 ****
/* add a source file to the list */
- /* TODO:-=db=-: remove the name parameter. it is not used
- * any longer, since we're now using path to check for
- * existence of file in srcfiles[]
- */
-
void
! addsrcfile(char *name, char *path)
{
struct listitem *p;
--- 574,579 ----
/* add a source file to the list */
void
! addsrcfile(char *path)
{
struct listitem *p;
|
|
From: Hans-Bernhard B. <br...@ph...> - 2001-10-10 15:25:57
|
On Tue, 9 Oct 2001, Petr Sorfa wrote:
> /* compute its path from higher view path source dirs */
> for (i = 1; i < nvpsrcdirs; ++i) {
> ! (void) snprintf(path, PATHLEN+1,
> ! "%s/%s", srcdirs[i], dir);
> addincdir(dir, path);
> }
Bad plan, I'd say. Please note snprintf() is not a reliably existing
functions. This change just broke the cscope build on my
alphaev5-dec-osf4.0d box here.
Moreover, snprintf isn't even strictly necessary in this case. With a bit
of arithmetics, and the help of the "%.*s" sprintf format, we would
limit the output without having to use snprintf().
--
Hans-Bernhard Broeker (br...@ph...)
Even if all the snow were burnt, ashes would remain.
|
|
From: Petr S. <pe...@us...> - 2001-10-09 18:59:10
|
Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv31785/src
Modified Files:
dir.c
Log Message:
Possible prevention of a buffer overflow (Valentin).
Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** dir.c 2001/07/09 14:58:25 1.12
--- dir.c 2001/10/09 18:59:07 1.13
***************
*** 202,206 ****
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) sprintf(path, "%s/%s", srcdirs[i], dir);
addincdir(dir, path);
}
--- 202,207 ----
/* compute its path from higher view path source dirs */
for (i = 1; i < nvpsrcdirs; ++i) {
! (void) snprintf(path, PATHLEN+1,
! "%s/%s", srcdirs[i], dir);
addincdir(dir, path);
}
|
|
From: Petr S. <pe...@us...> - 2001-10-09 18:59:10
|
Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv31785
Modified Files:
AUTHORS ChangeLog
Log Message:
Possible prevention of a buffer overflow (Valentin).
Index: AUTHORS
===================================================================
RCS file: /cvsroot/cscope/cscope/AUTHORS,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** AUTHORS 2001/07/05 21:25:03 1.29
--- AUTHORS 2001/10/09 18:59:07 1.30
***************
*** 30,31 ****
--- 30,32 ----
Dmitry Obukhov - Hilight code in webcscope
David Cohrs - LEX and SUNOS scanner fix
+ Valentin Podlovchenko - Overflow prevention and link recursion fix patch
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -r1.102 -r1.103
*** ChangeLog 2001/09/27 12:38:18 1.102
--- ChangeLog 2001/10/09 18:59:07 1.103
***************
*** 1,2 ****
--- 1,3 ----
+ (2001/10/09 - valentin) Prevention of a possible buffer overflow.
(2001/09/27 - broeker) Added autoconf test to use Cygwin's separate
-lregex. The regcomp() in libc is not what we want.
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-09-27 12:41:04
|
Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv29382
Modified Files:
configure config.h.in
Log Message:
Use autoconf to detect and use Cygwin's -lregex
Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** configure 2001/07/05 14:30:59 1.14
--- configure 2001/09/27 12:41:00 1.15
***************
*** 2129,2132 ****
--- 2129,2180 ----
+ echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
+ echo "configure:2133: checking for regcomp in -lregex" >&5
+ ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-lregex $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2141 "configure"
+ #include "confdefs.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 regcomp();
+
+ int main() {
+ regcomp()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo regex | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+
+ LIBS="-lregex $LIBS"
+
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
***************
*** 2134,2143 ****
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:2137: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2142 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 2182,2191 ----
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:2185: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2190 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 2147,2151 ****
; return 0; }
EOF
! if { (eval echo configure:2150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
--- 2195,2199 ----
; return 0; }
EOF
! if { (eval echo configure:2198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
***************
*** 2172,2176 ****
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:2175: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 2220,2224 ----
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:2223: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 2180,2184 ****
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2183 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 2228,2232 ----
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2231 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 2191,2195 ****
; return 0; }
EOF
! if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 2239,2243 ----
; return 0; }
EOF
! if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 2213,2217 ****
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:2216: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 2261,2265 ----
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:2264: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 2221,2225 ****
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2224 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 2269,2273 ----
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2272 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 2232,2236 ****
; return 0; }
EOF
! if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 2280,2284 ----
; return 0; }
EOF
! if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 2255,2264 ****
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:2258: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2263 "configure"
#include "confdefs.h"
#include <stdlib.h>
--- 2303,2312 ----
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:2306: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2311 "configure"
#include "confdefs.h"
#include <stdlib.h>
***************
*** 2268,2272 ****
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2271: \"$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
--- 2316,2320 ----
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2319: \"$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
***************
*** 2285,2289 ****
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 2288 "configure"
#include "confdefs.h"
#include <string.h>
--- 2333,2337 ----
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 2336 "configure"
#include "confdefs.h"
#include <string.h>
***************
*** 2303,2307 ****
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 2306 "configure"
#include "confdefs.h"
#include <stdlib.h>
--- 2351,2355 ----
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
! #line 2354 "configure"
#include "confdefs.h"
#include <stdlib.h>
***************
*** 2324,2328 ****
else
cat > conftest.$ac_ext <<EOF
! #line 2327 "configure"
#include "confdefs.h"
#include <ctype.h>
--- 2372,2376 ----
else
cat > conftest.$ac_ext <<EOF
! #line 2375 "configure"
#include "confdefs.h"
#include <ctype.h>
***************
*** 2335,2339 ****
EOF
! if { (eval echo configure:2338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
--- 2383,2387 ----
EOF
! if { (eval echo configure:2386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
***************
*** 2361,2370 ****
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2364: 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 2369 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 2409,2418 ----
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2412: 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 2417 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 2389,2393 ****
; return 0; }
EOF
! if { (eval echo configure:2392: \"$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"
--- 2437,2441 ----
; return 0; }
EOF
! if { (eval echo configure:2440: \"$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"
***************
*** 2417,2431 ****
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2420: 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 2425 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2430: \"$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
--- 2465,2479 ----
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2468: 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 2473 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2478: \"$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
***************
*** 2455,2464 ****
echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2458: 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 2463 "configure"
#include "confdefs.h"
--- 2503,2512 ----
echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2506: 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 2511 "configure"
#include "confdefs.h"
***************
*** 2509,2513 ****
; return 0; }
EOF
! if { (eval echo configure:2512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
--- 2557,2561 ----
; return 0; }
EOF
! if { (eval echo configure:2560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
***************
*** 2530,2539 ****
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:2533: 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 2538 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 2578,2587 ----
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:2581: 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 2586 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 2563,2572 ****
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:2566: 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 2571 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 2611,2620 ----
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:2614: 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 2619 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 2596,2605 ****
echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:2599: 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 2604 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 2644,2653 ----
echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:2647: 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 2652 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 2630,2639 ****
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2633: 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 2638 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 2678,2687 ----
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2681: 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 2686 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 2652,2656 ****
; return 0; }
EOF
! if { (eval echo configure:2655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
--- 2700,2704 ----
; return 0; }
EOF
! if { (eval echo configure:2703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
***************
*** 2673,2682 ****
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2676: 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 2681 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 2721,2730 ----
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2724: 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 2729 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 2701,2705 ****
; return 0; }
EOF
! if { (eval echo configure:2704: \"$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"
--- 2749,2753 ----
; return 0; }
EOF
! if { (eval echo configure:2752: \"$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"
***************
*** 2728,2737 ****
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2731: 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 2736 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 2776,2785 ----
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2779: 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 2784 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 2756,2760 ****
; return 0; }
EOF
! if { (eval echo configure:2759: \"$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"
--- 2804,2808 ----
; return 0; }
EOF
! if { (eval echo configure:2807: \"$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"
Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** config.h.in 2001/07/05 14:30:59 1.9
--- config.h.in 2001/09/27 12:41:00 1.10
***************
*** 112,115 ****
--- 112,118 ----
#undef HAVE_UNISTD_H
+ /* Define if you have the regex library (-lregex). */
+ #undef HAVE_LIBREGEX
+
/* Name of package */
#undef PACKAGE
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-09-27 12:38:22
|
Update of /cvsroot/cscope/cscope In directory usw-pr-cvs1:/tmp/cvs-serv28743 Modified Files: ChangeLog configure.in Log Message: Use autoconf to detect and use Cygwin's -lregex Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -r1.101 -r1.102 *** ChangeLog 2001/09/13 16:45:30 1.101 --- ChangeLog 2001/09/27 12:38:18 1.102 *************** *** 1,2 **** --- 1,4 ---- + (2001/09/27 - broeker) Added autoconf test to use Cygwin's separate + -lregex. The regcomp() in libc is not what we want. (2001/09/13 - broeker) Move chunk for malformed CPP directives further down, so it won't incorrectly eat up #else or #endif directives. Index: configure.in =================================================================== RCS file: /cvsroot/cscope/cscope/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** configure.in 2001/07/05 14:31:00 1.20 --- configure.in 2001/09/27 12:38:18 1.21 *************** *** 474,477 **** --- 474,481 ---- dnl AC_CHECK_LIB(curses, main) + dnl Cygwin is a bit peculiar: it has the regcomp() functions, but in a + dnl separate library, so we have to check for that: + AC_CHECK_LIB(regex, regcomp) + dnl Checks for header files. AC_HEADER_DIRENT |
|
From: Hans-Bernhard B. <br...@us...> - 2001-09-13 16:45:34
|
Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv8367
Modified Files:
ChangeLog
Log Message:
Fix bug #460345, by moving one fscanner.l rule downwards.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -r1.100 -r1.101
*** ChangeLog 2001/08/27 13:35:43 1.100
--- ChangeLog 2001/09/13 16:45:30 1.101
***************
*** 1,2 ****
--- 1,5 ----
+ (2001/09/13 - broeker) Move chunk for malformed CPP directives further down, so
+ it won't incorrectly eat up #else or #endif directives.
+ Fixes bug #460345.
(2001/08/27 - broeker) Add C++-style comments to {comment} pattern. Fixes
bug #455441: C++ comments in the middle of a function
|
|
From: Hans-Bernhard B. <br...@us...> - 2001-09-13 16:44:57
|
Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv8202
Modified Files:
fscanner.l
Log Message:
Fix bug #460345, by moving one fscanner.l rule downwards.
Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** fscanner.l 2001/08/27 13:35:25 1.7
--- fscanner.l 2001/09/13 16:44:52 1.8
***************
*** 231,241 ****
/* NOTREACHED */
}
- <IN_PREPROC>.|\n |
- <IN_PREPROC>{identifier} { /* unknown preprocessor line */
- BEGIN(INITIAL);
- goto more;
- /* NOTREACHED */
- }
-
<IN_PREPROC>endif([^a-zA-Z0-9_$\n].*)? { /* #endif */
/* delay treatment of #endif depending on whether an
--- 231,234 ----
***************
*** 469,472 ****
--- 462,472 ----
/* NOTREACHED */
}
+ <IN_PREPROC>.|\n |
+ <IN_PREPROC>{identifier} { /* unknown preprocessor line */
+ BEGIN(INITIAL);
+ goto more;
+ /* NOTREACHED */
+ }
+
class{whitespace}+{identifier}({whitespace}|{identifier}|[():])*\{ { /* class definition */
classdef = YES;
|
