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...> - 2017-10-15 00:10:37
|
Update of /cvsroot/cscope/cscope/doc In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9402/doc Modified Files: Makefile.in Log Message: Prepare for move away from CVS, to git. Purge $Id$ tags and similar Rebuild autotools Add yacc flags and automake hint about 'egrep.h' Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** Makefile.in 20 Nov 2014 21:12:54 -0000 1.15 --- Makefile.in 15 Oct 2017 00:10:33 -0000 1.16 *************** *** 1,6 **** ! # Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation --- 1,6 ---- ! # Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation *************** *** 15,19 **** @SET_MAKE@ VPATH = @srcdir@ ! am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ case $${target_option-} in \ --- 15,29 ---- @SET_MAKE@ VPATH = @srcdir@ ! am__is_gnu_make = { \ ! if test -z '$(MAKELEVEL)'; then \ ! false; \ ! elif test -n '$(MAKE_HOST)'; then \ ! true; \ ! elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ! true; \ ! else \ ! false; \ ! fi; \ ! } am__make_running_with_option = \ case $${target_option-} in \ *************** *** 79,84 **** host_triplet = @host@ subdir = doc - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ --- 89,92 ---- *************** *** 86,89 **** --- 94,98 ---- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) + DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 141,144 **** --- 150,154 ---- MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ *************** *** 263,267 **** $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile - .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 273,276 ---- *************** *** 480,483 **** --- 489,494 ---- uninstall-man1 + .PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. |
From: Hans-Bernhard B. <br...@us...> - 2017-10-15 00:10:36
|
Update of /cvsroot/cscope/cscope/contrib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9402/contrib Modified Files: Makefile.in README ocs Log Message: Prepare for move away from CVS, to git. Purge $Id$ tags and similar Rebuild autotools Add yacc flags and automake hint about 'egrep.h' Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** Makefile.in 20 Nov 2014 21:12:54 -0000 1.16 --- Makefile.in 15 Oct 2017 00:10:33 -0000 1.17 *************** *** 1,6 **** ! # Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation --- 1,6 ---- ! # Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation *************** *** 16,20 **** VPATH = @srcdir@ ! am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ case $${target_option-} in \ --- 16,30 ---- VPATH = @srcdir@ ! am__is_gnu_make = { \ ! if test -z '$(MAKELEVEL)'; then \ ! false; \ ! elif test -n '$(MAKE_HOST)'; then \ ! true; \ ! elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ! true; \ ! else \ ! false; \ ! fi; \ ! } am__make_running_with_option = \ case $${target_option-} in \ *************** *** 80,85 **** host_triplet = @host@ subdir = contrib - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ --- 90,93 ---- *************** *** 87,90 **** --- 95,99 ---- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) + DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 140,143 **** --- 149,154 ---- esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ *************** *** 262,266 **** $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu contrib/Makefile - .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ --- 273,276 ---- *************** *** 469,472 **** --- 479,484 ---- uninstall-binSCRIPTS + .PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: README =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** README 26 May 2011 17:47:25 -0000 1.4 --- README 15 Oct 2017 00:10:33 -0000 1.5 *************** *** 1,4 **** Contributed addons and wrappers for cscope - $Id$ ocs - wrapper for cscope providing database generation through recursive --- 1,3 ---- Index: ocs =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/ocs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ocs 21 Jun 2004 18:13:21 -0000 1.4 --- ocs 15 Oct 2017 00:10:33 -0000 1.5 *************** *** 1,4 **** #!/bin/sh - # $Id$ # This utility maintains the database for cscope on a recursive dir set # Author: donwo Tue Jun 25 15:36:39 PDT 1996 --- 1,3 ---- |
From: Neil H. <nh...@us...> - 2015-08-07 13:11:39
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18658/src Modified Files: main.c Log Message: Adding chek on return code of search() in linemode Currently we don't check the return code of search() in line mode. If search fails reffile will be null, resulting in a crash when we call getc on it Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** main.c 20 Nov 2014 21:12:54 -0000 1.57 --- main.c 7 Aug 2015 13:11:35 -0000 1.58 *************** *** 797,804 **** field = *buf - '0'; strcpy(Pattern, buf + 1); ! search(); ! printf("cscope: %d lines\n", totallines); ! while ((c = getc(refsfound)) != EOF) { ! putchar(c); } break; --- 797,807 ---- field = *buf - '0'; strcpy(Pattern, buf + 1); ! if (search() == NO) { ! printf("Unable to search database\n"); ! } else { ! printf("cscope: %d lines\n", totallines); ! while ((c = getc(refsfound)) != EOF) { ! putchar(c); ! } } break; |
From: Hans-Bernhard B. <br...@us...> - 2015-04-04 20:05:41
|
Update of /cvsroot/cscope/cscope/contrib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24625/contrib Modified Files: cctree.txt Log Message: Fix DOS style line endings in one file; enable system C extensions, if available Index: cctree.txt =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/cctree.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cctree.txt 26 May 2011 17:47:25 -0000 1.1 --- cctree.txt 4 Apr 2015 20:05:38 -0000 1.2 *************** *** 1,537 **** ! *CCTree.txt* Plugin for C Call-Tree Explorer *CCTree* ! ! Author: Hari Rangarajan (First.Last AT gmail DOT com) ! Last Change: 20 May 2011 ! ! CCTree version 1.51 ! ! For Vim version 7.0 and above ! ! ============================================================================== [...1045 lines suppressed...] ! ============================================================================== ! 9. Thanks~ ! *CCTree-thanks* ! ! ! Qaiser Durrani (ver 1.51 -- Reporting issues with SunOS) ! Ben Fritz (ver 1.39 -- Suggestion/Testing for ! conceal feature) ! Ben Fritz (ver 1.26 -- Bug report) ! Frank Chang (ver 1.0x -- testing/UI enhancement ! ideas/bug fixes) ! Arun Chaganty/Timo Tiefel (Ver 0.60 -- bug report) ! Michael Wookey (Ver 0.40 -- Testing/bug report/patches) ! Yegappan Lakshmanan (Ver 0.20 -- Patches) ! ! The Vim Community, ofcourse :) ! ! ! vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl: ! |
From: Hans-Bernhard B. <br...@us...> - 2015-03-30 23:54:44
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15962/src Modified Files: version.h Log Message: Gear up for a 15.8b release Index: version.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/version.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** version.h 4 Aug 2012 15:39:27 -0000 1.11 --- version.h 30 Mar 2015 23:54:40 -0000 1.12 *************** *** 43,47 **** #define FILEVERSION 15 /* Initial Open Source and Linux Port */ ! #define FIXVERSION ".8a" /* feature and bug fix version */ #endif /* CSCOPE_VERSION_H */ --- 43,47 ---- #define FILEVERSION 15 /* Initial Open Source and Linux Port */ ! #define FIXVERSION ".8b" /* feature and bug fix version */ #endif /* CSCOPE_VERSION_H */ |
From: Hans-Bernhard B. <br...@us...> - 2014-11-20 21:28:56
|
Update of /cvsroot/cscope/cscope In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30475 Modified Files: ChangeLog Log Message: Backslash escapes in regexp / text searches were broken. (Revised version of SF patch #87) Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.213 retrieving revision 1.214 diff -C2 -r1.213 -r1.214 *** ChangeLog 20 Nov 2014 21:12:52 -0000 1.213 --- ChangeLog 20 Nov 2014 21:28:53 -0000 1.214 *************** *** 1,4 **** --- 1,14 ---- 2014-11-20 Hans-Bernhard Broeker <br...@ph...> + * src/egrep.y (yylex): Collapse some cases of the switch. Fix + fall-through that got broken some time before 15.8; similar to + patch #87. + (read_next_chunk): Refactored repeated code sequence into separate + function. + (egrep): Use new function. Replace some gotos by the code they + jump to. + + * src/exec.c (join): Initialize local variable. + * src/main.c (error_usage): Refactored code to output error. (main): Use new function instead of goto. |
From: Hans-Bernhard B. <br...@us...> - 2014-11-20 21:18:54
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30004 Modified Files: fscanner.l Log Message: Remove hand-coded comment-skipping function in favour of letting flex handle it. Index: fscanner.l =================================================================== RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** fscanner.l 2 Aug 2012 21:48:08 -0000 1.17 --- fscanner.l 20 Nov 2014 21:18:51 -0000 1.18 *************** *** 76,84 **** static BOOL fcndef; /* function definition */ static BOOL global; /* file global scope (outside functions) */ ! static int iflevel; /* #if nesting level */ static BOOL initializer; /* data initializer */ static int initializerbraces; /* data initializer outer brace count */ static BOOL lex; /* lex file */ ! static int miflevel = IFLEVELINC; /* maximum #if nesting level */ static int *maxifbraces; /* maximum brace count within #if */ static int *preifbraces; /* brace count before #if */ --- 76,84 ---- static BOOL fcndef; /* function definition */ static BOOL global; /* file global scope (outside functions) */ ! static size_t iflevel; /* #if nesting level */ static BOOL initializer; /* data initializer */ static int initializerbraces; /* data initializer outer brace count */ static BOOL lex; /* lex file */ ! static size_t miflevel = IFLEVELINC; /* maximum #if nesting level */ static int *maxifbraces; /* maximum brace count within #if */ static int *preifbraces; /* brace count before #if */ *************** *** 97,131 **** static int ident_start; /* begin of preceding identifier */ - /* If this is defined to 1, use flex rules rather than the input - * function to discard comments. The scanner gains quite a bit of - * speed this way, because of a large reduction of the number of I/O - * system/library calls. The original skipcomment_input() called - * getc() so often that the call overhead of shared libraries - * vs. static linking, alone, already caused a sizeable performance - * hit (up to 40% gross gain on a cscope -cub of its own source - * dir). */ - #define COMMENTS_BY_FLEX 1 - - #if !COMMENTS_BY_FLEX - static int skipcomment_input(void); - static int comment(void); - static int insidestring_input(int); - #endif - static void my_yymore(void); - #if COMMENTS_BY_FLEX - # define skipcomment_input input - #else - - # define YY_INPUT(buf,result,max_size) \ - { \ - int c = skipcomment_input (); \ - result = (c == EOF) ? YY_NULL : (buf[0] = c, 1); \ - } - - #endif /* !COMMENTS_BY_FLEX*/ - - %} identifier [a-zA-Z_$][a-zA-Z_0-9$]* --- 97,102 ---- *************** *** 293,298 **** if (iflevel == miflevel) { miflevel += IFLEVELINC; ! maxifbraces = myrealloc(maxifbraces, miflevel * sizeof(int)); ! preifbraces = myrealloc(preifbraces, miflevel * sizeof(int)); } /* push the current brace count */ --- 264,269 ---- if (iflevel == miflevel) { miflevel += IFLEVELINC; ! maxifbraces = myrealloc(maxifbraces, miflevel * sizeof(*maxifbraces)); ! preifbraces = myrealloc(preifbraces, miflevel * sizeof(*preifbraces)); } /* push the current brace count */ *************** *** 618,622 **** /* skip to the end of the line */ warning("line too long"); ! while ((c = skipcomment_input()) > LEXEOF) { if (c == '\n') { unput(c); --- 589,593 ---- /* skip to the end of the line */ warning("line too long"); ! while ((c = input()) > LEXEOF) { if (c == '\n') { unput(c); *************** *** 717,724 **** /* FIXME HBB 20001007: should call input() instead */ ! switch (skipcomment_input()) { /* tab and EOF just fall through */ case ' ': /* breakpoint number line */ case '[': ! for (i = 1; i < 8 && skipcomment_input() > LEXEOF; ++i) ; break; --- 688,695 ---- /* FIXME HBB 20001007: should call input() instead */ ! switch (input()) { /* tab and EOF just fall through */ case ' ': /* breakpoint number line */ case '[': ! for (i = 1; i < 8 && input() > LEXEOF; ++i) ; break; *************** *** 726,730 **** case '/': /* skip to the end of the line */ ! while ((c = skipcomment_input()) > LEXEOF) { if (c == '\n') { unput(c); --- 697,701 ---- case '/': /* skip to the end of the line */ ! while ((c = input()) > LEXEOF) { if (c == '\n') { unput(c); *************** *** 850,855 **** if (maxifbraces == NULL) { ! maxifbraces = mymalloc(miflevel * sizeof(int)); ! preifbraces = mymalloc(miflevel * sizeof(int)); } first = 0; /* buffer index for first char of symbol */ --- 821,826 ---- if (maxifbraces == NULL) { ! maxifbraces = mymalloc(miflevel * sizeof(*maxifbraces)); ! preifbraces = mymalloc(miflevel * sizeof(*preifbraces)); } first = 0; /* buffer index for first char of symbol */ *************** *** 919,1052 **** } - #if !COMMENTS_BY_FLEX - - /* A micro-scanner that serves as the input() function of the - * scanner. It throws away any comments in the input, correctly - * avoiding doing this inside string/character constants, and knows - * about backslash sequences. Now that the main scanner doesn't use - * yymore() any longer, this could be replaced by lex rules. Left for - * trying later. */ - - /* Status variable: If this is non-NUL, it's the character that - * terminates a string we're currently in. */ - static int string_terminator = '\0'; - - /* Helper routine: treat 'c' as a character found inside a - * string. Check if this character might be the end of that - * string. Backslashes have to be taken care of, for the sake of - * "quotes like \"these\" found inside a string". */ - static int - insidestring_input(int c) - { - static BOOL was_backslash = NO; - - if ((c == '\\') && (was_backslash == NO)) { - /* escape character found --> treat next char specially */ - /* FIXME HBB 20001003: need treatment of backslash in the main - * scanner, too. It'll get false line counts in case of "\\'", - * otherwise --- they can occur as part of a lex pattern */ - was_backslash = YES; - return c; - } - - if (((c == '\t') && (lex == YES)) - /* Note: "\\\n" is removed even inside strings! */ - || ((c == '\n') && (was_backslash == NO)) - || (c == EOF) - || ((c == string_terminator) && (was_backslash == NO)) - ) { - /* Line ended, or end-of-string was found. That is a syntax - * error. To recover, stop treatment as a string constant: */ - string_terminator = '\0'; - } else if (!isprint((unsigned char)c)) { - /* mask unprintable characters */ - c = ' '; - } - - was_backslash = NO; - return c; - } - - /* Helper function: skip over input until end of comment is found (or - * we find that it wasn't really comment, in the first place): */ - static int - comment(void) - { - int c, lastc; - - /* Coming here, we've just read in the opening '/' of a - * comment. */ - do { - if ((c = getc(yyin)) == '*') { /* C comment */ - lastc = '\0'; - while ((c = getc(yyin)) != EOF - /* fewer '/'s --> test them first! */ - && (c != '/' || lastc != '*') - ) { - if (c == '\n') { - /* keep the line number count */ - /* FIXME HBB 20001008: this is not synchronized - * properly with myylineno changes by the main - * scanner. A strong point in favour of moving - * this to lex-code that is, IMHO */ - ++myylineno; - } - lastc = c; - } - /* return a blank for Reiser cpp token concatenation */ - /* FIXME HBB 20001008: what on earth is 'Reiser cpp'? ANSI - * C defines cpp to explicitly replace any comment by a - * blank. Pre-ANSI cpp's behaved differently, but do we - * really want that? If at all, it should only ever be a - * non-default option (like gcc's "-traditional-cpp") - * */ - if ((c = getc(yyin)) == '_' || isalnum(c)) { - (void) ungetc(c, yyin); - c = ' '; - break; - } - } else if (c == '/') { /* C++ comment */ - while ((c = getc(yyin)) != EOF && c != '\n') { - ; /* do nothing else */ - } - break; - } else { /* not a comment */ - (void) ungetc(c, yyin); - c = '/'; - break; - /* NOTREACHED */ - } - - /* there may be an immediately following comment */ - } while (c == '/'); - return(c); - } - - /* The core of the actual input() function to be used by (f)lex. The - * calling scheme between this and the actual input() redefinition is - * a bit different for lex and flex. See the #ifdef FLEX_SCANNER part - * in the head section. */ - static int - skipcomment_input(void) - { - int c; - - c = getc (yyin); - if (string_terminator != '\0') { - /* don't look for comments inside strings! */ - return insidestring_input(c); - } else if (c == '/') { - /* swallow everything until end of comment, if this is one */ - return comment (); - } else if (c == '"' || c == '\'') { - /* a string is beginning here, so switch input method */ - string_terminator = c; - } - - return c; - } - - #endif /* !COMMENTS_BY_FLEX */ - #define MY_YY_ALLOCSTEP 1000 static void --- 890,893 ---- *************** *** 1058,1063 **** * shrink, nor will it be freed at end of program, for now */ while (my_yyleng + yyleng + 1 >= yytext_size) { ! my_yytext = myrealloc(my_yytext, ! yytext_size += MY_YY_ALLOCSTEP); } --- 899,903 ---- * shrink, nor will it be freed at end of program, for now */ while (my_yyleng + yyleng + 1 >= yytext_size) { ! my_yytext = myrealloc(my_yytext, yytext_size += MY_YY_ALLOCSTEP); } |
From: Hans-Bernhard B. <br...@us...> - 2014-11-20 21:16:25
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29792 Modified Files: exec.c Log Message: Initialize a local Index: exec.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/exec.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** exec.c 10 Apr 2009 13:39:23 -0000 1.12 --- exec.c 20 Nov 2014 21:16:21 -0000 1.13 *************** *** 169,173 **** join(pid_t p) { ! int status; pid_t w; --- 169,173 ---- join(pid_t p) { ! int status = -1; pid_t w; |
From: Hans-Bernhard B. <br...@us...> - 2014-11-20 21:12:57
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29475/src Modified Files: Makefile.in alloc.c build.c command.c crossref.c dir.c display.c find.c global.h input.c invlib.c invlib.h lookup.c main.c mypopen.c scanner.l vpinit.c Log Message: Update autotoolage, various code cleanups Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** Makefile.in 26 Jun 2013 20:58:48 -0000 1.19 --- Makefile.in 20 Nov 2014 21:12:54 -0000 1.20 *************** *** 1,8 **** ! # Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software ! # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.14.1 from Makefile.am. [...1191 lines suppressed...] --- 1120,1136 ---- .MAKE: install-am install-strip ! .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ ! clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ ! distclean distclean-compile distclean-generic distclean-tags \ ! distdir dvi dvi-am html html-am info info-am install \ ! install-am install-binPROGRAMS install-data install-data-am \ ! install-dvi install-dvi-am install-exec install-exec-am \ ! install-html install-html-am install-info install-info-am \ ! install-man install-pdf install-pdf-am install-ps \ ! install-ps-am install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ ! ps ps-am tags tags-am uninstall uninstall-am \ ! uninstall-binPROGRAMS Index: alloc.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/alloc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** alloc.c 23 Jul 2006 20:59:20 -0000 1.8 --- alloc.c 20 Nov 2014 21:12:54 -0000 1.9 *************** *** 64,68 **** mymalloc(size_t size) { ! return(alloctest(malloc((unsigned) size))); } --- 64,68 ---- mymalloc(size_t size) { ! return(alloctest(malloc(size))); } *************** *** 72,76 **** mycalloc(size_t nelem, size_t size) { ! return(alloctest(calloc((unsigned) nelem, (unsigned) size))); } --- 72,76 ---- mycalloc(size_t nelem, size_t size) { ! return(alloctest(calloc(nelem, size))); } *************** *** 80,84 **** myrealloc(void *p, size_t size) { ! return(alloctest(realloc(p, (unsigned) size))); } --- 80,84 ---- myrealloc(void *p, size_t size) { ! return(alloctest(realloc(p, size))); } Index: build.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/build.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** build.c 12 Jun 2011 13:25:56 -0000 1.16 --- build.c 20 Nov 2014 21:12:54 -0000 1.17 *************** *** 141,145 **** char *s; /* pointer to basename in path */ ! path = mymalloc(strlen(reffile) + 10); strcpy(path, reffile); s = mybasename(path); --- 141,145 ---- char *s; /* pointer to basename in path */ ! path = mymalloc(strlen(reffile) + 10u); strcpy(path, reffile); s = mybasename(path); *************** *** 227,231 **** } /* sort the source file names (needed for rebuilding) */ ! qsort(srcfiles, nsrcfiles, sizeof(char *), compare); /* if there is an old cross-reference and its current directory matches */ --- 227,231 ---- } /* sort the source file names (needed for rebuilding) */ ! qsort(srcfiles, nsrcfiles, sizeof(*srcfiles), compare); /* if there is an old cross-reference and its current directory matches */ *************** *** 368,372 **** lastfile = nsrcfiles; if (invertedindex == YES) { ! srcoffset = mymalloc((nsrcfiles + 1) * sizeof(long)); } for (;;) { --- 368,372 ---- lastfile = nsrcfiles; if (invertedindex == YES) { ! srcoffset = mymalloc((nsrcfiles + 1u) * sizeof(*srcoffset)); } for (;;) { *************** *** 423,432 **** lastfile = nsrcfiles; if (invertedindex == YES) { ! srcoffset = myrealloc(srcoffset, ! (nsrcfiles + 1) * sizeof(long)); } /* sort the included file names */ ! qsort(&srcfiles[firstfile], (lastfile - firstfile), ! sizeof(char *), compare); } /* add a null file name to the trailing tab */ --- 423,430 ---- lastfile = nsrcfiles; if (invertedindex == YES) { ! srcoffset = myrealloc(srcoffset, (nsrcfiles + 1) * sizeof(*srcoffset)); } /* sort the included file names */ ! qsort(srcfiles + firstfile, lastfile - firstfile, sizeof(*srcfiles), compare); } /* add a null file name to the trailing tab */ *************** *** 604,608 **** copydata(void) { - char symbol[PATLEN + 1]; char *cp; --- 602,605 ---- *************** *** 630,633 **** --- 627,631 ---- /* look for an #included file */ if (*cp == INCLUDE) { + char symbol[PATLEN + 1]; blockp = cp; fetch_include_from_dbase(symbol, sizeof(symbol)); Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** command.c 20 May 2012 13:58:53 -0000 1.36 --- command.c 20 Nov 2014 21:12:54 -0000 1.37 *************** *** 315,321 **** } if (c != '\r' && ! mygetline("", newpat, ! COLS - sizeof(appendprompt), c, NO) > 0 ! ) { shellpath(filename, sizeof(filename), newpat); if ((file = myfopen(filename, s)) == NULL) { --- 315,319 ---- } if (c != '\r' && ! mygetline("", newpat, COLS - sizeof(appendprompt), c, NO) > 0) { shellpath(filename, sizeof(filename), newpat); if ((file = myfopen(filename, s)) == NULL) { *************** *** 337,342 **** move(PRLINE, 0); addstr(readprompt); ! if (mygetline("", newpat, COLS - sizeof(readprompt), ! '\0', NO) > 0) { clearprompt(); shellpath(filename, sizeof(filename), newpat); --- 335,339 ---- move(PRLINE, 0); addstr(readprompt); ! if (mygetline("", newpat, COLS - sizeof(readprompt), '\0', NO) > 0) { clearprompt(); shellpath(filename, sizeof(filename), newpat); *************** *** 359,364 **** move(PRLINE, 0); addstr(pipeprompt); ! if (mygetline("", newpat, COLS - sizeof(pipeprompt), '\0', NO) ! == 0) { clearprompt(); return(NO); --- 356,360 ---- move(PRLINE, 0); addstr(pipeprompt); ! if (mygetline("", newpat, COLS - sizeof(pipeprompt), '\0', NO) == 0) { clearprompt(); return(NO); *************** *** 624,628 **** } /* create the line change indicators */ ! change = mycalloc(totallines, sizeof(BOOL)); changing = YES; mousemenu(); --- 620,624 ---- } /* create the line change indicators */ ! change = mycalloc(totallines, sizeof(*change)); changing = YES; mousemenu(); Index: crossref.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/crossref.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** crossref.c 28 Aug 2009 14:28:27 -0000 1.15 --- crossref.c 20 Nov 2014 21:12:54 -0000 1.16 *************** *** 49,64 **** ! /* convert long to a string */ ! #define ltobase(value) n = value; \ ! s = buf + (sizeof(buf) - 1); \ ! *s = '\0'; \ ! digits = 1; \ ! while (n >= BASE) { \ ! ++digits; \ ! i = n; \ ! n /= BASE; \ ! *--s = i - n * BASE + '!'; \ ! } \ ! *--s = n + '!'; #define SYMBOLINC 20 /* symbol list size increment */ --- 49,67 ---- ! /* convert long to a string in base BASE notation */ ! #define ltobase(value) \ ! do { \ ! n = (value); \ ! s = buf + (sizeof(buf) - 1); \ ! *s = '\0'; \ ! digits = 1; \ ! while (n >= BASE) { \ ! ++digits; \ ! i = n; \ ! n /= BASE; \ ! *--s = i - n * BASE + '!'; \ ! } \ ! *--s = n + '!'; \ ! } while (0) #define SYMBOLINC 20 /* symbol list size increment */ *************** *** 122,126 **** symbols = 0; if (symbol == NULL) { ! symbol = mymalloc(msymbols * sizeof(struct symbol)); } for (;;) { --- 125,129 ---- symbols = 0; if (symbol == NULL) { ! symbol = mymalloc(msymbols * sizeof(*symbol)); } for (;;) { *************** *** 201,205 **** if (symbols == msymbols) { msymbols += SYMBOLINC; ! symbol = myrealloc(symbol, msymbols * sizeof(struct symbol)); } /* save the symbol */ --- 204,208 ---- if (symbols == msymbols) { msymbols += SYMBOLINC; ! symbol = myrealloc(symbol, msymbols * sizeof(*symbol)); } /* save the symbol */ Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** dir.c 4 Mar 2010 21:11:43 -0000 1.32 --- dir.c 20 Nov 2014 21:12:54 -0000 1.33 *************** *** 45,48 **** --- 45,49 ---- #include <dirent.h> #include <sys/stat.h> /* stat */ + #include <assert.h> static char const rcsid[] = "$Id$"; *************** *** 107,111 **** /* create the source directory list */ msrcdirs = nsrcdirs + DIRINC; ! srcdirs = mymalloc(msrcdirs * sizeof(char *)); *srcdirs = "."; /* first source dir is always current dir */ for (i = 1; i < vpndirs; ++i) { --- 108,112 ---- /* create the source directory list */ msrcdirs = nsrcdirs + DIRINC; ! srcdirs = mymalloc(msrcdirs * sizeof(*srcdirs)); *srcdirs = "."; /* first source dir is always current dir */ for (i = 1; i < vpndirs; ++i) { *************** *** 166,170 **** if (nsrcdirs == msrcdirs) { msrcdirs += DIRINC; ! srcdirs = myrealloc(srcdirs, msrcdirs * sizeof(char *)); } srcdirs[nsrcdirs++] = my_strdup(dir); --- 167,171 ---- if (nsrcdirs == msrcdirs) { msrcdirs += DIRINC; ! srcdirs = myrealloc(srcdirs, msrcdirs * sizeof(*srcdirs)); } srcdirs[nsrcdirs++] = my_strdup(dir); *************** *** 231,242 **** S_ISDIR(statstruct.st_mode)) { if (incdirs == NULL) { ! incdirs = mymalloc(mincdirs * sizeof(char *)); ! incnames = mymalloc(mincdirs * sizeof(char *)); } else if (nincdirs == mincdirs) { mincdirs += DIRINC; ! incdirs = myrealloc(incdirs, ! mincdirs * sizeof(char *)); ! incnames = myrealloc(incnames, ! mincdirs * sizeof(char *)); } incdirs[nincdirs] = my_strdup(path); --- 232,241 ---- S_ISDIR(statstruct.st_mode)) { if (incdirs == NULL) { ! incdirs = mymalloc(mincdirs * sizeof(*incdirs)); ! incnames = mymalloc(mincdirs * sizeof(*incnames)); } else if (nincdirs == mincdirs) { mincdirs += DIRINC; ! incdirs = myrealloc(incdirs, mincdirs * sizeof(*incdirs)); ! incnames = myrealloc(incnames, mincdirs * sizeof(*incnames)); } incdirs[nincdirs] = my_strdup(path); *************** *** 489,493 **** struct dirent *entry; char path[PATHLEN + 1]; - char *file; while ((entry = readdir(dirfile)) != NULL) { --- 488,491 ---- *************** *** 501,505 **** if (lstat(path,&buf) == 0) { - file = entry->d_name; if (recurse_dir && S_ISDIR(buf.st_mode) ) { --- 499,502 ---- *************** *** 595,598 **** --- 592,596 ---- unsigned int i; + assert(file != NULL); /* should never happen, but let's make sure anyway */ /* see if the file is already in the source file list */ if (infilelist(file) == YES) { *************** *** 701,709 **** if (nsrcfiles == msrcfiles) { msrcfiles += SRCINC; ! srcfiles = myrealloc(srcfiles, msrcfiles * sizeof(char *)); } /* add the file to the list */ srcfiles[nsrcfiles++] = my_strdup(compath(path)); ! p = mymalloc(sizeof(struct listitem)); p->text = my_strdup(compath(path)); i = hash(p->text) % HASHMOD; --- 699,707 ---- if (nsrcfiles == msrcfiles) { msrcfiles += SRCINC; ! srcfiles = myrealloc(srcfiles, msrcfiles * sizeof(*srcfiles)); } /* add the file to the list */ srcfiles[nsrcfiles++] = my_strdup(compath(path)); ! p = mymalloc(sizeof(*p)); p->text = my_strdup(compath(path)); i = hash(p->text) % HASHMOD; Index: display.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/display.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** display.c 20 May 2012 12:24:17 -0000 1.33 --- display.c 20 Nov 2014 21:12:54 -0000 1.34 *************** *** 118,122 **** /* Internal prototypes: */ ! static RETSIGTYPE jumpback(int sig); /* initialize display parameters */ --- 118,122 ---- /* Internal prototypes: */ ! static void jumpback(int sig); /* initialize display parameters */ *************** *** 139,143 **** /* allocate the displayed line array */ ! displine = mymalloc(mdisprefs * sizeof(int)); } --- 139,143 ---- /* allocate the displayed line array */ ! displine = mymalloc(mdisprefs * sizeof(*displine)); } *************** *** 399,403 **** /*ARGSUSED*/ ! static RETSIGTYPE jumpback(int sig) { --- 399,403 ---- /*ARGSUSED*/ ! static void jumpback(int sig) { *************** *** 565,572 **** char *s; - s = "Unknown error"; #ifdef HAVE_STRERROR s = strerror(errno); #else if (errno < sys_nerr) { s = sys_errlist[errno]; --- 565,573 ---- char *s; #ifdef HAVE_STRERROR s = strerror(errno); #else + s = "Unknown error"; + if (errno < sys_nerr) { s = sys_errlist[errno]; Index: find.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/find.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** find.c 15 Apr 2014 16:12:15 -0000 1.26 --- find.c 20 Nov 2014 21:12:54 -0000 1.27 *************** *** 876,880 **** /* read the previous block */ (void) dbseek((blocknumber - 1) * BUFSIZ); ! cp = &block[BUFSIZ - 1]; } } --- 876,880 ---- /* read the previous block */ (void) dbseek((blocknumber - 1) * BUFSIZ); ! cp = block + (BUFSIZ - 1); } } *************** *** 1210,1215 **** if (dbseek(p->lineoffset) != -1) { scanpast(FCNDEF); ! fetch_string_from_dbase(function, ! sizeof(function)); } } --- 1210,1214 ---- if (dbseek(p->lineoffset) != -1) { scanpast(FCNDEF); ! fetch_string_from_dbase(function, sizeof(function)); } } Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** global.h 5 Mar 2012 19:28:13 -0000 1.38 --- global.h 20 Nov 2014 21:12:54 -0000 1.39 *************** *** 82,96 **** #include "library.h" /* library function return values */ - /* Fallback, in case 'configure' failed to do its part of the job */ - #ifndef RETSIGTYPE - #if SVR2 || BSD && !sun - #define RETSIGTYPE int - #else - #define RETSIGTYPE void - #endif - #endif /* RETSIGTYPE */ - #ifndef HAVE_SIGHANDLER_T ! typedef RETSIGTYPE (*sighandler_t)(int); #endif --- 82,87 ---- #include "library.h" /* library function return values */ #ifndef HAVE_SIGHANDLER_T ! typedef void (*sighandler_t)(int); #endif Index: input.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/input.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** input.c 20 Aug 2006 15:00:34 -0000 1.15 --- input.c 20 Nov 2014 21:12:54 -0000 1.16 *************** *** 55,64 **** /* Internal prototypes: */ ! static RETSIGTYPE catchint(int sig); /* catch the interrupt signal */ /*ARGSUSED*/ ! static RETSIGTYPE catchint(int sig) { --- 55,64 ---- /* Internal prototypes: */ ! static void catchint(int sig); /* catch the interrupt signal */ /*ARGSUSED*/ ! static void catchint(int sig) { *************** *** 80,84 **** mygetch(void) { ! sighandler_t savesig; /* old value of signal */ int c; --- 80,84 ---- mygetch(void) { ! sighandler_t savesig = 0; /* old value of signal */ int c; *************** *** 126,130 **** * onto the end of 's' */ ! sright = calloc(sizeof(char), size ); strcpy ( s, p); --- 126,130 ---- * onto the end of 's' */ ! sright = calloc(size, sizeof(*sright)); strcpy ( s, p); Index: invlib.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/invlib.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** invlib.c 10 Jul 2012 20:01:40 -0000 1.21 --- invlib.c 20 Nov 2014 21:12:54 -0000 1.22 *************** *** 78,86 **** static POSTING *item, *enditem, *item1 = NULL, *item2 = NULL; ! static unsigned setsize1, setsize2; static long numitems, totterm, zerolong; static char *indexfile, *postingfile; static FILE *outfile, *fpost; ! static unsigned supersize = SUPERINC, supintsize; static unsigned int numpost, numlogblk, amtused, nextpost; static unsigned int lastinblk, numinvitems; --- 78,86 ---- static POSTING *item, *enditem, *item1 = NULL, *item2 = NULL; ! static unsigned int setsize1, setsize2; static long numitems, totterm, zerolong; static char *indexfile, *postingfile; static FILE *outfile, *fpost; ! static size_t supersize = SUPERINC, supintsize; static unsigned int numpost, numlogblk, amtused, nextpost; static unsigned int lastinblk, numinvitems; *************** *** 110,114 **** int i; long fileindex = 0; /* initialze, to avoid warning */ ! unsigned postsize = POSTINC * sizeof(POSTING); unsigned long *intptr; char line[TERMMAX]; --- 110,114 ---- int i; long fileindex = 0; /* initialze, to avoid warning */ ! unsigned postsize = POSTINC * sizeof(*POST); unsigned long *intptr; char line[TERMMAX]; *************** *** 149,156 **** supfing = SUPFING; /* FIXME HBB: magic number alert (40) */ ! supintsize = supersize / 40; /* also for the superfinger index */ ! if ((SUPINT = malloc(supintsize * sizeof(long))) == NULL) { ! invcannotalloc(supintsize * sizeof(long)); return(0); } --- 149,156 ---- supfing = SUPFING; /* FIXME HBB: magic number alert (40) */ ! supintsize = supersize / 40u; /* also for the superfinger index */ ! if ((SUPINT = malloc(supintsize * sizeof(*SUPINT))) == NULL) { ! invcannotalloc(supintsize * sizeof(*SUPINT)); return(0); } *************** *** 198,204 **** #endif if (strcmp(thisterm, line) == 0) { ! if (postptr + 10 > POST + postsize / sizeof(POSTING)) { i = postptr - POST; ! postsize += POSTINC * sizeof(POSTING); if ((POST = realloc(POST, postsize)) == NULL) { invcannotalloc(postsize); --- 198,204 ---- #endif if (strcmp(thisterm, line) == 0) { ! if ((postptr + 10) > (POST + (postsize / sizeof(*POST)))) { i = postptr - POST; ! postsize += POSTINC * sizeof(*POST); if ((POST = realloc(POST, postsize)) == NULL) { invcannotalloc(postsize); *************** *** 380,387 **** if (numinvitems && numwilluse + amtused > sizeof(t_logicalblk)) { /* set up new block */ ! if (supfing + 500 > SUPFING + supersize) { i = supfing - SUPFING; ! supersize += 20000; ! if ((SUPFING = (char *)realloc(SUPFING, supersize)) == NULL) { invcannotalloc(supersize); return(0); --- 380,387 ---- if (numinvitems && numwilluse + amtused > sizeof(t_logicalblk)) { /* set up new block */ ! if (supfing + 500u > SUPFING + supersize) { i = supfing - SUPFING; ! supersize += 20000u; ! if ((SUPFING = realloc(SUPFING, supersize)) == NULL) { invcannotalloc(supersize); return(0); *************** *** 398,409 **** i = supint - SUPINT; supintsize += SUPERINC; ! if ((SUPINT = realloc(SUPINT, supintsize * sizeof(long))) == NULL) { ! invcannotalloc(supintsize * sizeof(long)); return(0); } supint = i + SUPINT; #if DEBUG ! printf("reallocated superfinger offset to %d, totpost = %ld\n", ! supintsize * sizeof(long), totpost); #endif } --- 398,408 ---- i = supint - SUPINT; supintsize += SUPERINC; ! if ((SUPINT = realloc(SUPINT, supintsize * sizeof(*SUPINT))) == NULL) { ! invcannotalloc(supintsize * sizeof(*SUPINT)); return(0); } supint = i + SUPINT; #if DEBUG ! printf("reallocated superfinger offset to %d, totpost = %ld\n", supintsize * sizeof(*SUPINT), totpost); #endif } *************** *** 500,508 **** logicalblk.invblk[(lastinblk/sizeof(long))+wdlen] = nextpost; if ((i = postptr - POST) > 0) { ! if (fwrite(POST, sizeof(POSTING), i, fpost) == 0) { invcannotwrite(postingfile); return(0); } ! nextpost += i * sizeof(POSTING); } logicalblk.invblk[3+2*numinvitems++] = iteminfo.packword[0]; --- 499,507 ---- logicalblk.invblk[(lastinblk/sizeof(long))+wdlen] = nextpost; if ((i = postptr - POST) > 0) { ! if (fwrite(POST, sizeof(*POST), i, fpost) == 0) { invcannotwrite(postingfile); return(0); } ! nextpost += i * sizeof(*POST); } logicalblk.invblk[3+2*numinvitems++] = iteminfo.packword[0]; *************** *** 534,537 **** --- 533,576 ---- } + /* small helper function to centralize handling of binary opening + * for reading, and use of the 'stat" flag */ + static FILE * + open_for_reading(char *name, int stat) + { + return vpfopen(name, ((stat == 0) ? "rb" : "r+b")); + } + + /* handle opening of a file under a possibly "flipped" name */ + /* If db created without '-f', but now invoked with '-f cscope.out', + * we need to check for 'cscope.in.out', rather than 'cscope.out.in': + * I.e, hack around our own violation of the inverse db naming convention */ + /* more silliness: if you create the db with '-f cscope', then try to open + * it without '-f cscope', you'll fail unless we check for 'cscope.out.in' + * here. */ + static FILE * + open_file_with_flipped_name(char *name, const char *flip_in, const char *flip_out, int stat) + { + if (! invflipname(name, flip_in, flip_out)) { + FILE *fptr = open_for_reading(name, stat); + if (! fptr) + /* flip back for error message */ + invflipname(name, flip_out, flip_in); + return fptr; + }; + return 0; + } + + static FILE * + open_file_with_possibly_flipped_name(char *name, const char *flip1, const char *flip2, int stat) + { + FILE *fptr = open_for_reading(name, stat); + + if (! fptr) + fptr = open_file_with_flipped_name(name, flip2, flip1, stat); + if (! fptr) + fptr = open_file_with_flipped_name(name, flip1, flip2, stat); + return fptr; + } + int invopen(INVCONTROL *invcntl, char *invname, char *invpost, int stat) *************** *** 539,570 **** int read_index; ! if ((invcntl->invfile = vpfopen(invname, ((stat == 0) ? "rb" : "r+b"))) == NULL) { ! /* If db created without '-f', but now invoked with '-f cscope.out', ! * we need to check for 'cscope.in.out', rather than 'cscope.out.in': ! * I.e, hack around our own violation of the inverse db naming convention */ ! if (!invflipname(invname, INVNAME2, INVNAME)) { ! if ((invcntl->invfile = vpfopen(invname, ((stat == 0) ? "rb" : "r+b")))) ! goto openedinvname; ! invflipname(invname, INVNAME, INVNAME2); /* change back for err msg */ ! } ! /* more silliness: if you create the db with '-f cscope', then try to open ! * it without '-f cscope', you'll fail unless we check for 'cscope.out.in' ! * here. */ ! else if (!invflipname(invname, INVNAME, INVNAME2)) { ! if ((invcntl->invfile = vpfopen(invname, ((stat == 0) ? "rb" : "r+b")))) ! goto openedinvname; ! invflipname(invname, INVNAME2, INVNAME); /* change back for err msg */ ! } invcannotopen(invname); return(-1); } - openedinvname: if (fread(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile) == 0) { fprintf(stderr, "%s: empty inverted file\n", argv0); ! goto closeinv; } if (invcntl->param.version != FMTVERSION) { fprintf(stderr, "%s: cannot read old index format; use -U option to force database to rebuild\n", argv0); ! goto closeinv; } assert(invcntl->param.sizeblk == sizeof(t_logicalblk)); --- 578,595 ---- int read_index; ! invcntl->invfile = open_file_with_possibly_flipped_name(invname, INVNAME, INVNAME2, stat); ! if (! invcntl->invfile) { invcannotopen(invname); return(-1); } if (fread(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile) == 0) { fprintf(stderr, "%s: empty inverted file\n", argv0); ! fclose(invcntl->invfile); ! return(-1); } if (invcntl->param.version != FMTVERSION) { fprintf(stderr, "%s: cannot read old index format; use -U option to force database to rebuild\n", argv0); ! fclose(invcntl->invfile); ! return(-1); } assert(invcntl->param.sizeblk == sizeof(t_logicalblk)); *************** *** 572,596 **** if (stat == 0 && invcntl->param.filestat == INVALONE) { fprintf(stderr, "%s: inverted file is locked\n", argv0); ! goto closeinv; } ! if ((invcntl->postfile = vpfopen(invpost, ((stat == 0) ? "rb" : "r+b"))) == NULL) { ! /* exact same naming convention hacks as above for invname */ ! if (!invflipname(invpost, INVPOST2, INVPOST)) { ! if ((invcntl->postfile = vpfopen(invpost, ((stat == 0) ? "rb" : "r+b")))) ! goto openedinvpost; ! invflipname(invpost, INVPOST, INVPOST2); /* change back for err msg */ ! } else if (!invflipname(invpost, INVPOST, INVPOST2)) { ! if ((invcntl->postfile = vpfopen(invpost,((stat == 0)?"rb":"r+b")))) ! goto openedinvpost; ! invflipname(invpost, INVPOST2, INVPOST); /* change back for err msg */ ! } invcannotopen(invpost); ! goto closeinv; } ! openedinvpost: /* allocate core for a logical block */ ! if ((invcntl->logblk = malloc((unsigned) invcntl->param.sizeblk)) == NULL) { ! invcannotalloc((unsigned) invcntl->param.sizeblk); ! goto closeboth; } /* allocate for and read in superfinger */ --- 597,617 ---- if (stat == 0 && invcntl->param.filestat == INVALONE) { fprintf(stderr, "%s: inverted file is locked\n", argv0); ! fclose(invcntl->invfile); ! return(-1); } ! ! invcntl->postfile = open_file_with_possibly_flipped_name(invpost, INVPOST, INVPOST2, stat); ! if (! invcntl->postfile) { invcannotopen(invpost); ! fclose(invcntl->invfile); ! return(-1); } ! /* allocate core for a logical block */ ! if ((invcntl->logblk = malloc((size_t) invcntl->param.sizeblk)) == NULL) { ! invcannotalloc((size_t) invcntl->param.sizeblk); ! fclose(invcntl->postfile); ! fclose(invcntl->invfile); ! return(-1); } /* allocate for and read in superfinger */ *************** *** 626,636 **** #endif if (invcntl->iindex == NULL) ! /* FIXME HBB: magic number alert (4) */ ! invcntl->iindex = malloc((unsigned) invcntl->param.supsize ! + 4 *sizeof(long)); if (invcntl->iindex == NULL) { ! invcannotalloc((unsigned) invcntl->param.supsize); free(invcntl->logblk); ! goto closeboth; } if (read_index) { --- 647,658 ---- #endif if (invcntl->iindex == NULL) ! /* FIXME HBB: magic number alert (4, sizeof(long)) */ ! invcntl->iindex = malloc((size_t) invcntl->param.supsize + 4 *sizeof(long)); if (invcntl->iindex == NULL) { ! invcannotalloc((size_t) invcntl->param.supsize); free(invcntl->logblk); ! fclose(invcntl->postfile); ! fclose(invcntl->invfile); ! return(-1); } if (read_index) { *************** *** 641,647 **** invcntl->numblk = -1; if (boolready() == -1) { - closeboth: fclose(invcntl->postfile); - closeinv: fclose(invcntl->invfile); return(-1); --- 663,667 ---- *************** *** 880,884 **** free(item1); setsize1 = SETINC; ! if ((item1 = malloc(SETINC * sizeof(POSTING))) == NULL) { invcannotalloc(SETINC); return(-1); --- 900,904 ---- free(item1); setsize1 = SETINC; ! if ((item1 = malloc(SETINC * sizeof(*item1))) == NULL) { invcannotalloc(SETINC); return(-1); *************** *** 887,891 **** free(item2); setsize2 = SETINC; ! if ((item2 = malloc(SETINC * sizeof(POSTING))) == NULL) { invcannotalloc(SETINC); return(-1); --- 907,911 ---- free(item2); setsize2 = SETINC; ! if ((item2 = malloc(SETINC * sizeof(*item2))) == NULL) { invcannotalloc(SETINC); return(-1); *************** *** 946,952 **** if (u > setsize1) { u += SETINC; ! if ((item1 = realloc( ! item1, u * sizeof(POSTING))) == NULL) { ! goto cannotalloc; } setsize1 = u; --- 966,974 ---- if (u > setsize1) { u += SETINC; ! if ((item1 = realloc(item1, u * sizeof(*item1))) == NULL) { ! invcannotalloc(u * sizeof(*item1)); ! boolready(); ! *num = -1; ! return(NULL); } setsize1 = u; *************** *** 957,964 **** if (u > setsize2) { u += SETINC; ! if ((item2 = realloc( ! item2, u * sizeof(POSTING))) == NULL) { ! cannotalloc: ! invcannotalloc(u * sizeof(POSTING)); boolready(); *num = -1; --- 979,984 ---- if (u > setsize2) { u += SETINC; ! if ((item2 = realloc(item2, u * sizeof(*item2))) == NULL) { ! invcannotalloc(u * sizeof(*item2)); boolready(); *num = -1; *************** *** 1153,1158 **** return(ptr); } ! i = (enditem - item) * sizeof(POSTING) + 100; ! if ((ptr = malloc(i))r == NULL) { invcannotalloc(i); return(ptr); --- 1173,1178 ---- return(ptr); } ! i = (enditem - item) * sizeof(*ptr) + 100; ! if ((ptr = malloc(i)) == NULL) { invcannotalloc(i); return(ptr); Index: invlib.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/invlib.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** invlib.h 12 Feb 2004 18:14:05 -0000 1.7 --- invlib.h 20 Nov 2014 21:12:54 -0000 1.8 *************** *** 38,47 **** #include <stdio.h> /* need definition of FILE* */ ! #include <limits.h> /* inverted index definitions */ /* postings temporary file long number coding into characters */ - /* FIXME HBB: where would these definitions come from ? */ #if CHAR_MAX==255 # define BASE 223 /* 255 - ' ' */ --- 38,46 ---- #include <stdio.h> /* need definition of FILE* */ ! #include <limits.h> /* need definition of CHAR_MAX */ /* inverted index definitions */ /* postings temporary file long number coding into characters */ #if CHAR_MAX==255 # define BASE 223 /* 255 - ' ' */ Index: lookup.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/lookup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** lookup.c 21 Apr 2006 10:45:48 -0000 1.4 --- lookup.c 20 Nov 2014 21:12:54 -0000 1.5 *************** *** 96,100 **** {"volatile", ' ', NULL}, }; ! #define KEYWORDS (sizeof(keyword) / sizeof(struct keystruct)) #define HASHMOD (KEYWORDS * 2 + 1) --- 96,100 ---- {"volatile", ' ', NULL}, }; ! #define KEYWORDS (sizeof(keyword) / sizeof(keyword[0])) #define HASHMOD (KEYWORDS * 2 + 1) Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** main.c 20 Nov 2012 15:20:26 -0000 1.56 --- main.c 20 Nov 2014 21:12:54 -0000 1.57 *************** *** 117,120 **** --- 117,121 ---- /* Internal prototypes: */ + static void error_usage(void); static void initcompress(void); static void longusage(void); *************** *** 281,285 **** */ *argc = *argc - optind; ! return &argv[optind]; } #endif --- 282,286 ---- */ *argc = *argc - optind; ! return argv + optind; } #endif *************** *** 418,422 **** fprintf(stderr, "%s: -%c option: missing or empty value\n", argv0, c); ! goto usage; } switch (c) { --- 419,423 ---- fprintf(stderr, "%s: -%c option: missing or empty value\n", argv0, c); ! error_usage(); } switch (c) { *************** *** 456,460 **** %s: -p option: missing or invalid numeric value\n", argv0); ! goto usage; } dispcomponents = atoi(s); --- 457,461 ---- %s: -p option: missing or invalid numeric value\n", argv0); ! error_usage(); } dispcomponents = atoi(s); *************** *** 472,479 **** fprintf(stderr, "%s: unknown option: -%c\n", argv0, *s); ! usage: ! usage(); ! fprintf(stderr, "Try the -h option for more information.\n"); ! myexit(1); } /* switch(option letter) */ } /* for(option) */ --- 473,477 ---- fprintf(stderr, "%s: unknown option: -%c\n", argv0, *s); ! error_usage(); } /* switch(option letter) */ } /* for(option) */ *************** *** 645,649 **** } /* get the source file list */ ! srcfiles = mymalloc(nsrcfiles * sizeof(char *)); if (fileversion >= 9) { --- 643,647 ---- } /* get the source file list */ ! srcfiles = mymalloc(nsrcfiles * sizeof(*srcfiles)); if (fileversion >= 9) { *************** *** 717,721 **** } /* make the source file list */ ! srcfiles = mymalloc(msrcfiles * sizeof(char *)); makefilelist(); if (nsrcfiles == 0) { --- 715,719 ---- } /* make the source file list */ ! srcfiles = mymalloc(msrcfiles * sizeof(*srcfiles)); makefilelist(); if (nsrcfiles == 0) { *************** *** 991,994 **** --- 989,1000 ---- } + /* error exit including short usage information */ + static void + error_usage(void) + { + usage(); + fprintf(stderr, "Try the -h option for more information.\n"); + myexit(1); + } /* normal usage message */ Index: mypopen.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** mypopen.c 21 Apr 2006 10:40:29 -0000 1.14 --- mypopen.c 20 Nov 2014 21:12:54 -0000 1.15 *************** *** 36,40 **** #include <sys/types.h> #include <sys/wait.h> ! #include "global.h" /* pid_t, RETSIGTYPE, shell, and mybasename() */ #define tst(a,b) (*mode == 'r'? (b) : (a)) --- 36,40 ---- #include <sys/types.h> #include <sys/wait.h> ! #include "global.h" /* pid_t, shell, and mybasename() */ #define tst(a,b) (*mode == 'r'? (b) : (a)) *************** *** 56,60 **** static pid_t popen_pid[20]; ! static RETSIGTYPE (*tstat)(int); int --- 56,60 ---- static pid_t popen_pid[20]; ! static void (*tstat)(int); int *************** *** 178,186 **** mypclose(FILE *ptr) { - int f; - pid_t r; - int status; - sighandler_t hstat, istat, qstat; - #ifdef __DJGPP__ /* HBB 20010705: This system has its own pclose(), which we --- 178,181 ---- *************** *** 188,191 **** --- 183,191 ---- return (pclose)(ptr); #else + int f; + pid_t r; + int status = -1; + sighandler_t hstat, istat, qstat; + f = fileno(ptr); (void) fclose(ptr); *************** *** 194,198 **** hstat = signal(SIGHUP, SIG_IGN); while((r = wait(&status)) != popen_pid[f] && r != -1) ! ; if(r == -1) status = -1; --- 194,198 ---- hstat = signal(SIGHUP, SIG_IGN); while((r = wait(&status)) != popen_pid[f] && r != -1) ! ; /* nothing */ if(r == -1) status = -1; Index: scanner.l =================================================================== RCS file: /cvsroot/cscope/cscope/src/scanner.l,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** scanner.l 29 Jun 2011 15:48:00 -0000 1.10 --- scanner.l 20 Nov 2014 21:12:54 -0000 1.11 *************** *** 62,70 **** static BOOL fcndef; /* function definition */ static BOOL global; /* file global scope (outside functions) */ ! static int iflevel; /* #if nesting level */ static BOOL initializer; /* data initializer */ static int initializerbraces; /* data initializer outer brace count */ static BOOL lex; /* lex file */ ! static int miflevel = IFLEVELINC; /* maximum #if nesting level */ static int *maxifbraces; /* maximum brace count within #if */ static int *preifbraces; /* brace count before #if */ --- 62,70 ---- static BOOL fcndef; /* function definition */ static BOOL global; /* file global scope (outside functions) */ ! static size_t iflevel; /* #if nesting level */ static BOOL initializer; /* data initializer */ static int initializerbraces; /* data initializer outer brace count */ static BOOL lex; /* lex file */ ! static size_t miflevel = IFLEVELINC; /* maximum #if nesting level */ static int *maxifbraces; /* maximum brace count within #if */ static int *preifbraces; /* brace count before #if */ *************** *** 216,221 **** if (iflevel == miflevel) { miflevel += IFLEVELINC; ! maxifbraces = myrealloc(maxifbraces, miflevel * sizeof(int)); ! preifbraces = myrealloc(preifbraces, miflevel * sizeof(int)); } /* push the current brace count */ --- 216,221 ---- if (iflevel == miflevel) { miflevel += IFLEVELINC; ! maxifbraces = myrealloc(maxifbraces, miflevel * sizeof(*maxifbraces)); ! preifbraces = myrealloc(preifbraces, miflevel * sizeof(*preifbraces)); } /* push the current brace count */ *************** *** 603,608 **** if (maxifbraces == NULL) { ! maxifbraces = mymalloc(miflevel * sizeof(int)); ! preifbraces = mymalloc(miflevel * sizeof(int)); } first = 0; /* buffer index for first char of symbol */ --- 603,608 ---- if (maxifbraces == NULL) { ! maxifbraces = mymalloc(miflevel * sizeof(*maxifbraces)); ! preifbraces = mymalloc(miflevel * sizeof(*preifbraces)); } first = 0; /* buffer index for first char of symbol */ Index: vpinit.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/vpinit.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** vpinit.c 23 Jul 2006 20:59:20 -0000 1.8 --- vpinit.c 20 Nov 2014 21:12:54 -0000 1.9 *************** *** 106,110 **** } /* create the source directory list */ ! vpdirs = mymalloc(vpndirs * sizeof(char *)); /* don't change VPATH in the environment */ --- 106,110 ---- } /* create the source directory list */ ! vpdirs = mymalloc(vpndirs * sizeof(*vpdirs)); /* don't change VPATH in the environment */ *************** *** 125,129 **** /* convert the view path nodes to directories */ for (i = 0; i < vpndirs; ++i) { ! s = mymalloc((strlen(vpdirs[i]) + strlen(suffix) + 1)); (void) strcpy(s, vpdirs[i]); (void) strcat(s, suffix); --- 125,129 ---- /* convert the view path nodes to directories */ for (i = 0; i < vpndirs; ++i) { ! s = mymalloc(strlen(vpdirs[i]) + strlen(suffix) + 1); (void) strcpy(s, vpdirs[i]); (void) strcat(s, suffix); |
From: Hans-Bernhard B. <br...@us...> - 2014-11-20 19:33:17
|
Update of /cvsroot/cscope/cscope In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24098 Modified Files: ChangeLog Log Message: Quote any pathnames containing blanks as found by cscope-indexer Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.211 retrieving revision 1.212 diff -C2 -r1.211 -r1.212 *** ChangeLog 15 Apr 2014 16:12:15 -0000 1.211 --- ChangeLog 20 Nov 2014 19:33:13 -0000 1.212 *************** *** 1,6 **** 2014-04-15 Neil Horman <nh...@tu...> ! * src/find.c: ensure that putpostigref assigns function array ! properly (sf bz 200) 2013-09-25 Hans-Bernhard Broeker <br...@ph...> --- 1,17 ---- + 2014-11-20 Hans-Bernhard Broeker <br...@ph...> + + * contrib/xcscope/cscope-indexer: Automatically wrap pathnames in + quotes if they contain blanks or tabs. + + 2014-11-16 Hans-Bernhard Broeker <br...@ph...> + + * src/fscanner.l (skipcomment_input, comment, insidestring_input) + (string_terminator, YY_INPUT): Remove hand-coded comment skipping + function, use flex-generated one instead. + 2014-04-15 Neil Horman <nh...@tu...> ! * src/find.c (putpostingref): Ensure that initialization of ! function name (sf bz 200). 2013-09-25 Hans-Bernhard Broeker <br...@ph...> |
From: Neil H. <nh...@us...> - 2014-04-15 16:12:19
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22982/src Modified Files: find.c Log Message: Ensure that putpostingref has non-empty string putpostingref may end up with an empty string in its function array, leading to bad formatting in the display. This patch makes sure that we have a valid string in said funtion array fixes https://sourceforge.net/p/cscope/bugs/200/ Signed-off-by: Neil Horman <nh...@tu...> Index: find.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/find.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** find.c 15 Jun 2012 11:18:11 -0000 1.25 --- find.c 15 Apr 2014 16:12:15 -0000 1.26 *************** *** 1202,1206 **** putpostingref(POSTING *p, char *pat) { ! static char function[PATLEN + 1]; /* function name */ if (p->fcnoffset == 0) { --- 1202,1208 ---- putpostingref(POSTING *p, char *pat) { ! // initialize function to "unknown" so that the first line of temp1 ! // is properly formed if symbol matches a header file entry first time ! static char function[PATLEN + 1] = "unknown";/* function name */ if (p->fcnoffset == 0) { |
From: Hans-Bernhard B. <br...@us...> - 2013-09-24 22:22:22
|
Update of /cvsroot/cscope/cscope In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17244 Modified Files: ChangeLog Log Message: "Assignments to this symbol" search was missing from man page. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.209 retrieving revision 1.210 diff -C2 -r1.209 -r1.210 *** ChangeLog 26 Jun 2013 20:58:48 -0000 1.209 --- ChangeLog 24 Sep 2013 22:22:18 -0000 1.210 *************** *** 1,2 **** --- 1,8 ---- + 2013-09-25 Hans-Bernhard Broeker <br...@ph...> + + * doc/cscope.1: "Find assignments to" search was missing from the + man page. Thanks to Roberto E. Vargas Caballero for noticing + this. + 2013-06-26 Hans-Bernhard Broeker <br...@ph...> |
From: Darryl <da...@us...> - 2013-08-06 07:50:14
|
Update of /cvsroot/cscope/cscope/contrib/xcscope In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17515 Modified Files: xcscope.el Log Message: Added optional autoclose. Also fixed [Ret] key for plain Emacs. Index: xcscope.el =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/xcscope/xcscope.el,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** xcscope.el 9 Apr 2013 14:35:57 -0000 1.15 --- xcscope.el 6 Aug 2013 07:50:10 -0000 1.16 *************** *** 831,834 **** --- 831,840 ---- + (defcustom cscope-close-window-after-select nil + "*If non-nil close the window showing the cscope buffer after an entry has been selected." + :type 'boolean + :group 'cscope) + + (defvar cscope-minor-mode-hooks nil "List of hooks to call when entering cscope-minor-mode.") *************** *** 916,919 **** --- 922,927 ---- (define-key cscope-list-entry-keymap [mouse-2] 'cscope-mouse-select-entry-other-window)) (define-key cscope-list-entry-keymap [return] 'cscope-select-entry-other-window) + ;; \r is for Emacs: + (define-key cscope-list-entry-keymap "\r" 'cscope-select-entry-other-window) (define-key cscope-list-entry-keymap " " 'cscope-show-entry-other-window) (define-key cscope-list-entry-keymap "o" 'cscope-select-entry-one-window) *************** *** 1388,1392 **** (if (windowp window) (select-window window)) ! )) --- 1396,1402 ---- (if (windowp window) (select-window window)) ! ) ! (if cscope-close-window-after-select ! (delete-windows-on cscope-output-buffer-name))) |
From: Hans-Bernhard B. <br...@us...> - 2013-06-26 20:58:52
|
Update of /cvsroot/cscope/cscope/doc In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31200/doc Modified Files: Makefile.in Log Message: Add check for large file support Regenerate auto-foo with version 2.69, automake 1.11.6 Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** Makefile.in 4 Aug 2012 15:40:01 -0000 1.13 --- Makefile.in 26 Jun 2013 20:58:48 -0000 1.14 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ *************** *** 16,19 **** --- 16,36 ---- @SET_MAKE@ VPATH = @srcdir@ + am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ *************** *** 47,50 **** --- 64,72 ---- SOURCES = DIST_SOURCES = + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ *************** *** 219,227 **** install-man1: $(man_MANS) @$(NORMAL_INSTALL) ! test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ! @list=''; test -n "$(man1dir)" || exit 0; \ ! { for i in $$list; do echo "$$i"; done; \ ! l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ! sed -n '/\.1[a-z]*$$/p'; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ --- 241,256 ---- install-man1: $(man_MANS) @$(NORMAL_INSTALL) ! @list1=''; \ ! list2='$(man_MANS)'; \ ! test -n "$(man1dir)" \ ! && test -n "`echo $$list1$$list2`" \ ! || exit 0; \ ! echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ ! $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ ! { for i in $$list1; do echo "$$i"; done; \ ! if test -n "$$list2"; then \ ! for i in $$list2; do echo "$$i"; done \ ! | sed -n '/\.1[a-z]*$$/p'; \ ! fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
From: Neil H. <nh...@us...> - 2013-04-09 14:36:01
|
Update of /cvsroot/cscope/cscope In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12486 Modified Files: ChangeLog Log Message: Add find assignments search to xcscope.el Resolves https://sourceforge.net/p/cscope/patches/79/ Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.207 retrieving revision 1.208 diff -C2 -r1.207 -r1.208 *** ChangeLog 29 Dec 2012 13:46:39 -0000 1.207 --- ChangeLog 9 Apr 2013 14:35:57 -0000 1.208 *************** *** 1,2 **** --- 1,6 ---- + 2013-04-09 Neil Horman <nh...@tu...> + * contrib/xcscope/xcscope.el: Add find assignments search to + xcscope.el + 2012-12-29 Hans-Bernhard Broeker <br...@ph...> |
From: Neil H. <nh...@us...> - 2013-04-09 14:36:00
|
Update of /cvsroot/cscope/cscope/contrib/xcscope In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12486/contrib/xcscope Modified Files: xcscope.el Log Message: Add find assignments search to xcscope.el Resolves https://sourceforge.net/p/cscope/patches/79/ Index: xcscope.el =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/xcscope/xcscope.el,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** xcscope.el 10 Apr 2002 16:59:00 -0000 1.14 --- xcscope.el 9 Apr 2013 14:35:57 -0000 1.15 *************** *** 928,931 **** --- 928,932 ---- (define-key cscope-list-entry-keymap "G" 'cscope-find-global-definition-no-prompting) + (define-key cscope-list-entry-keymap "=" 'cscope-find-assignments-to-this-symbol) (define-key cscope-list-entry-keymap "c" 'cscope-find-functions-calling-this-function) (define-key cscope-list-entry-keymap "C" 'cscope-find-called-functions) *************** *** 1120,1123 **** --- 1121,1125 ---- (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-cs=" 'cscope-find-assignments-to-this-symbol) (define-key cscope:map "\C-csc" 'cscope-find-functions-calling-this-function) (define-key cscope:map "\C-csC" 'cscope-find-called-functions) *************** *** 1155,1158 **** --- 1157,1162 ---- [ "Find global definition no prompting" cscope-find-global-definition-no-prompting t ] + [ "Find assignments to symbol" + cscope-find-assignments-to-this-symbol t ] [ "Find functions calling a function" cscope-find-functions-calling-this-function t ] *************** *** 2425,2428 **** --- 2429,2446 ---- + (defun cscope-find-assignments-to-this-symbol (symbol) + "Locate assignments to a symbol in the source code." + (interactive (list + (cscope-prompt-for-symbol "Find assignments to this symbol: " nil) + )) + (let ( (cscope-adjust t) ) ;; Use fuzzy matching. + (setq cscope-symbol symbol) + (cscope-call (format "Finding assignments to symbol: %s" symbol) + (list "-9" symbol) nil 'cscope-process-filter + 'cscope-process-sentinel) + )) + + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
From: Hans-Bernhard B. <br...@us...> - 2012-12-29 13:46:43
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9307/src Modified Files: constants.h Log Message: Mac OSX claims to have terminfo Index: constants.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/constants.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** constants.h 7 Apr 2012 14:12:07 -0000 1.18 --- constants.h 29 Dec 2012 13:46:39 -0000 1.19 *************** *** 104,108 **** #define FIELDS 10 ! #if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ # define TERMINFO 0 /* no terminfo curses */ #else --- 104,108 ---- #define FIELDS 10 ! #if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ && !__APPLE__ # define TERMINFO 0 /* no terminfo curses */ #else |
From: Neil H. <nh...@us...> - 2010-09-30 14:29:28
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27638/src Modified Files: main.c Log Message: Ignore SIGINT in line mode Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** main.c 21 Dec 2009 12:17:47 -0000 1.51 --- main.c 30 Sep 2010 14:29:19 -0000 1.52 *************** *** 541,544 **** --- 541,550 ---- signal(SIGTERM, myexit); + /* ignore PIPE signal, so myexit() will have a chance to clean up in + * linemode, while in curses mode the "|" command can cause a pipe signal + * too + */ + signal(SIGPIPE, SIG_IGN); + /* if the database path is relative and it can't be created */ if (reffile[0] != '/' && access(".", WRITE) != 0) { *************** *** 562,566 **** if (linemode == NO) { signal(SIGINT, SIG_IGN); /* ignore interrupts */ - signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */ #if defined(KEY_RESIZE) && !defined(__DJGPP__) --- 568,571 ---- |
From: Neil H. <nh...@us...> - 2010-09-30 14:29:28
|
Update of /cvsroot/cscope/cscope In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27638 Modified Files: ChangeLog Log Message: Ignore SIGINT in line mode Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.186 retrieving revision 1.187 diff -C2 -r1.186 -r1.187 *** ChangeLog 4 Mar 2010 21:09:38 -0000 1.186 --- ChangeLog 30 Sep 2010 14:29:19 -0000 1.187 *************** *** 1,2 **** --- 1,6 ---- + 2010-09-30 Neil Horman <nh...@tu...> + * src/main.c: Ignore SIGPIPE in linemode as well to allow + for proper file cleanup + 2010-03-04 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2010-03-04 21:11:52
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25779/src Modified Files: dir.c Log Message: snprintf format precision arguments need to be int, not size_t. Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** dir.c 10 Apr 2009 13:39:23 -0000 1.31 --- dir.c 4 Mar 2010 21:11:43 -0000 1.32 *************** *** 210,214 **** for (i = 1; i < nvpsrcdirs; ++i) { snprintf(path, sizeof(path), "%.*s/%s", ! PATHLEN - 2 - dir_len, srcdirs[i], dir); addincdir(dir, path); --- 210,214 ---- for (i = 1; i < nvpsrcdirs; ++i) { snprintf(path, sizeof(path), "%.*s/%s", ! (int)(PATHLEN - 2 - dir_len), srcdirs[i], dir); addincdir(dir, path); *************** *** 609,613 **** /* don't include the file from two directories */ snprintf(name, sizeof(name), "%.*s/%s", ! PATHLEN - 2 - file_len, incnames[i], file); if (infilelist(name) == YES) { --- 609,613 ---- /* don't include the file from two directories */ snprintf(name, sizeof(name), "%.*s/%s", ! (int)(PATHLEN - 2 - file_len), incnames[i], file); if (infilelist(name) == YES) { *************** *** 616,620 **** /* make sure it exists and is readable */ snprintf(path, sizeof(path), "%.*s/%s", ! PATHLEN - 2 - file_len, incdirs[i], file); if (access(compath(path), READ) == 0) { --- 616,620 ---- /* make sure it exists and is readable */ snprintf(path, sizeof(path), "%.*s/%s", ! (int)(PATHLEN - 2 - file_len), incdirs[i], file); if (access(compath(path), READ) == 0) { |
From: Hans-Bernhard B. <br...@us...> - 2010-03-04 21:09:47
|
Update of /cvsroot/cscope/cscope In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25565 Modified Files: ChangeLog Log Message: Allow C++ :: scope operator insidie function argument lists snprintf format precision arguments need to be int, not size_t. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -r1.185 -r1.186 *** ChangeLog 21 Dec 2009 12:17:46 -0000 1.185 --- ChangeLog 4 Mar 2010 21:09:38 -0000 1.186 *************** *** 1,2 **** --- 1,10 ---- + 2010-03-04 Hans-Bernhard Broeker <br...@ph...> + + * src/dir.c (includedir, incfile): Cast size_t value to integer + for use as a *printf() precision argument. + + * src/fscanner.l, src/scanner.l: Tolerate C++ :: scope operator + inside argument lists, too. + 2009-12-21 Neil Horman <nh...@tu...> * src/main.c: Added some more missing short options to parse_options |
From: Hans-Bernhard B. <br...@us...> - 2010-03-04 21:07:26
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25178/src Modified Files: fscanner.l scanner.l Log Message: Allow C++ :: scope operator insidie function argument lists Index: fscanner.l =================================================================== RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** fscanner.l 28 Aug 2009 14:28:27 -0000 1.14 --- fscanner.l 4 Mar 2010 21:07:17 -0000 1.15 *************** *** 529,533 **** <WAS_IDENTIFIER>{ ! {ws}*\(({wsnl}|{identifier}|{number}|[*&[\]=,.])*\)([()]|{wsnl})*[:a-zA-Z_#{] { /* a function definition */ /* note: "#define a (b) {" and "#if defined(a)\n#" --- 529,533 ---- <WAS_IDENTIFIER>{ ! {ws}*\(({wsnl}|{identifier}|{number}|[*&[\]=,.:])*\)([()]|{wsnl})*[:a-zA-Z_#{] { /* a function definition */ /* note: "#define a (b) {" and "#if defined(a)\n#" Index: scanner.l =================================================================== RCS file: /cvsroot/cscope/cscope/src/scanner.l,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** scanner.l 9 Mar 2007 23:54:34 -0000 1.8 --- scanner.l 4 Mar 2010 21:07:17 -0000 1.9 *************** *** 376,380 **** goto more; } ! {identifier}/{ws}*\(({wsnl}|a-zA-Z0-9_*&[\]=,.])*\)({wsnl}|[()])*[:a-zA-Z_#{] { /* warning: "if (...)" must not overflow yytext, so the content --- 376,380 ---- goto more; } ! {identifier}/{ws}*\(({wsnl}|a-zA-Z0-9_*&[\]=,.:])*\)({wsnl}|[()])*[:a-zA-Z_#{] { /* warning: "if (...)" must not overflow yytext, so the content |
From: Neil H. <nh...@us...> - 2009-12-21 12:52:53
|
Update of /cvsroot/cscope/cscope/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12550/src Modified Files: main.c Log Message: Adding help/version options to parse_options Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -r1.50 -r1.51 *** main.c 14 Dec 2009 17:54:22 -0000 1.50 --- main.c 21 Dec 2009 12:17:47 -0000 1.51 *************** *** 198,201 **** --- 198,205 ---- editallprompt = NO; break; + case 'h': + longusage(); + myexit(1); + break; case 'k': /* ignore DFLT_INCDIR */ kernelmode = YES; *************** *** 210,213 **** --- 214,222 ---- verbosemode = YES; break; + case 'V': + fprintf(stderr, "%s: version %d%s\n", argv0, + FILEVERSION, FIXVERSION); + myexit(0); + break; case 'q': /* quick search */ invertedindex = YES; |
From: Neil H. <nh...@us...> - 2009-12-21 12:52:33
|
Update of /cvsroot/cscope/cscope In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12550 Modified Files: ChangeLog Log Message: Adding help/version options to parse_options Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.184 retrieving revision 1.185 diff -C2 -r1.184 -r1.185 *** ChangeLog 14 Dec 2009 17:54:21 -0000 1.184 --- ChangeLog 21 Dec 2009 12:17:46 -0000 1.185 *************** *** 1,2 **** --- 1,5 ---- + 2009-12-21 Neil Horman <nh...@tu...> + * src/main.c: Added some more missing short options to parse_options + 2009-12-14 Neil Horman <nh...@tu...> * src/main.c: Added missing line mode operation options to |
From: Neil H. <nh...@us...> - 2009-12-14 17:54:36
|
Update of /cvsroot/cscope/cscope In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25554 Modified Files: ChangeLog Log Message: Added missing linemode operations to parse_arguments Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.183 retrieving revision 1.184 diff -C2 -r1.183 -r1.184 *** ChangeLog 14 Dec 2009 13:51:49 -0000 1.183 --- ChangeLog 14 Dec 2009 17:54:21 -0000 1.184 *************** *** 1,3 **** --- 1,7 ---- 2009-12-14 Neil Horman <nh...@tu...> + * src/main.c: Added missing line mode operation options to + parse_arguments + + 2009-12-14 Neil Horman <nh...@tu...> * src/main.c: Fixed adjustments to argc/argv in parse_option to account for the possibility that someone might specify multiple options in |