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...> - 2005-02-01 16:10:18
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6076 Modified Files: ChangeLog Log Message: Ignore terminal interactivity check in -b -v mode. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -r1.144 -r1.145 *** ChangeLog 31 Jan 2005 16:50:31 -0000 1.144 --- ChangeLog 1 Feb 2005 16:10:05 -0000 1.145 *************** *** 1,2 **** --- 1,7 ---- + 2005-02-01 Hans-Bernhard Broeker <br...@ph...> + + * src/build.c (build): Keep interactive mode on, even if on a + terminal, if verbose mode (-v) was turned on. + 2005-01-31 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2005-01-31 16:50:44
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18779 Modified Files: ChangeLog Log Message: Make yytext signed for AIX lex. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -r1.143 -r1.144 *** ChangeLog 30 Jan 2005 19:33:27 -0000 1.143 --- ChangeLog 31 Jan 2005 16:50:31 -0000 1.144 *************** *** 1,2 **** --- 1,7 ---- + 2005-01-31 Hans-Bernhard Broeker <br...@ph...> + + * src/scanner.h: Declare yytext signed on AIX (without stating a + version number, for now). + 2005-01-30 Hans-Bernhard Broeker <br...@ph...> *************** *** 4,13 **** manifest null pointer, not just a zero. ! 2004-12-08 Neil Horman <nh...@gm...> * src/dir.c: Fix to dissallow unreadable files from srcfiles list (sourceforge bug number 1040690) ! 2004-12-06 Neil Horman <nh...@gm...> * src/main.c: Fix for temp file security bug (sourceforge --- 9,18 ---- manifest null pointer, not just a zero. ! 2004-12-08 Neil Horman <nh...@gm...> * src/dir.c: Fix to dissallow unreadable files from srcfiles list (sourceforge bug number 1040690) ! 2004-12-06 Neil Horman <nh...@gm...> * src/main.c: Fix for temp file security bug (sourceforge |
From: Hans-Bernhard B. <br...@us...> - 2005-01-31 16:50:42
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18779/src Modified Files: scanner.h Log Message: Make yytext signed for AIX lex. Index: scanner.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/scanner.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** scanner.h 11 Jul 2001 13:36:27 -0000 1.3 --- scanner.h 31 Jan 2005 16:50:33 -0000 1.4 *************** *** 77,81 **** * private copies of yytext and yytext for the world outside scanner.l: */ /* FIXME: there should be a feature test for this! */ ! #if defined(__OSF1__) || defined(__sun) extern char yytext[]; #else --- 77,81 ---- * private copies of yytext and yytext for the world outside scanner.l: */ /* FIXME: there should be a feature test for this! */ ! #if defined(__OSF1__) || defined(__sun) || defined(_AIX) extern char yytext[]; #else |
From: Hans-Bernhard B. <br...@us...> - 2005-01-30 19:33:37
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31589 Modified Files: ChangeLog Log Message: Make last arg of execlp() a manifest null pointer. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -r1.142 -r1.143 *** ChangeLog 8 Dec 2004 21:23:02 -0000 1.142 --- ChangeLog 30 Jan 2005 19:33:27 -0000 1.143 *************** *** 1,7 **** ! 2004-12-08 Neil Horman <nh...@gm...> * src/dir.c: Fix to dissallow unreadable files from srcfiles list (sourceforge bug number 1040690) ! 2004-12-06 Neil Horman <nh...@gm...> * src/main.c: Fix for temp file security bug (sourceforge bug number 1062807 / CAN-2004-0970) --- 1,14 ---- ! 2005-01-30 Hans-Bernhard Broeker <br...@ph...> ! ! * src/mypopen.c (mypopen): Make closing argument to execlp() a ! manifest null pointer, not just a zero. ! ! 2004-12-08 Neil Horman <nh...@gm...> ! * src/dir.c: Fix to dissallow unreadable files from srcfiles list (sourceforge bug number 1040690) ! 2004-12-06 Neil Horman <nh...@gm...> ! * src/main.c: Fix for temp file security bug (sourceforge bug number 1062807 / CAN-2004-0970) |
From: Hans-Bernhard B. <br...@us...> - 2005-01-30 19:33:36
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31589/src Modified Files: mypopen.c Log Message: Make last arg of execlp() a manifest null pointer. Index: mypopen.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** mypopen.c 12 Feb 2004 18:14:05 -0000 1.12 --- mypopen.c 30 Jan 2005 19:33:28 -0000 1.13 *************** *** 149,161 **** } stdio = tst(0, 1); ! (void) close(myside); ! (void) close(stdio); #if V9 ! (void) dup2(yourside, stdio); #else ! (void) fcntl(yourside, F_DUPFD, stdio); #endif ! (void) close(yourside); ! (void) execlp(shell, mybasename(shell), "-c", cmd, 0); _exit(1); } else if (pid > 0) --- 149,161 ---- } stdio = tst(0, 1); ! close(myside); ! close(stdio); #if V9 ! dup2(yourside, stdio); #else ! fcntl(yourside, F_DUPFD, stdio); #endif ! close(yourside); ! execlp(shell, mybasename(shell), "-c", cmd, (void *)0); _exit(1); } else if (pid > 0) |
From: Neil H. <nh...@us...> - 2004-12-08 21:23:45
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24815/src Modified Files: dir.c Log Message: fixing srcfiles to only include readable files (sourceforge bug 1040690) Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** dir.c 23 Jun 2004 15:41:59 -0000 1.21 --- dir.c 8 Dec 2004 21:23:03 -0000 1.22 *************** *** 514,518 **** && issrcfile(path) && infilelist(path) == NO) { ! addsrcfile(path); } } --- 514,519 ---- && issrcfile(path) && infilelist(path) == NO) { ! if(access(path,R_OK) == 0) ! addsrcfile(path); } } |
From: Neil H. <nh...@us...> - 2004-12-08 21:23:45
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24815 Modified Files: ChangeLog Log Message: fixing srcfiles to only include readable files (sourceforge bug 1040690) Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -r1.141 -r1.142 *** ChangeLog 6 Dec 2004 14:56:42 -0000 1.141 --- ChangeLog 8 Dec 2004 21:23:02 -0000 1.142 *************** *** 1,2 **** --- 1,6 ---- + 2004-12-08 Neil Horman <nh...@gm...> + * src/dir.c: Fix to dissallow unreadable files from + srcfiles list (sourceforge bug number 1040690) + 2004-12-06 Neil Horman <nh...@gm...> * src/main.c: Fix for temp file security bug (sourceforge |
From: Neil H. <nh...@us...> - 2004-12-06 14:56:53
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539 Modified Files: AUTHORS ChangeLog configure Log Message: Fixing sourceforge bug 1062807 Index: AUTHORS =================================================================== RCS file: /cvsroot/cscope/cscope/AUTHORS,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** AUTHORS 4 Sep 2003 17:15:34 -0000 1.32 --- AUTHORS 6 Dec 2004 14:56:42 -0000 1.33 *************** *** 32,33 **** --- 32,34 ---- David Cohrs - LEX and SUNOS scanner fix Valentin Podlovchenko - Overflow prevention and link recursion fix patch + Neil Horman <nh...@gm...> - Various Bug Fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -r1.140 -r1.141 *** ChangeLog 29 Nov 2004 12:50:21 -0000 1.140 --- ChangeLog 6 Dec 2004 14:56:42 -0000 1.141 *************** *** 1,2 **** --- 1,6 ---- + 2004-12-06 Neil Horman <nh...@gm...> + * src/main.c: Fix for temp file security bug (sourceforge + bug number 1062807 / CAN-2004-0970) + 2004-11-22 Hans-Bernhard Broeker <br...@ph...> Index: configure =================================================================== RCS file: /cvsroot/cscope/cscope/configure,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** configure 24 Feb 2004 15:13:20 -0000 1.24 --- configure 6 Dec 2004 14:56:42 -0000 1.25 *************** *** 1,7 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.58. # ! # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,8 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. [...3486 lines suppressed...] sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } *************** *** 7606,7613 **** as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } --- 7168,7175 ---- as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
From: Neil H. <nh...@us...> - 2004-12-06 14:56:52
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/src Modified Files: main.c Log Message: Fixing sourceforge bug 1062807 Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** main.c 30 Apr 2004 15:31:43 -0000 1.33 --- main.c 6 Dec 2004 14:56:43 -0000 1.34 *************** *** 102,105 **** --- 102,106 ---- char temp1[PATHLEN + 1]; /* temporary file name */ char temp2[PATHLEN + 1]; /* temporary file name */ + char tempdirpv[PATHLEN +1]; /* private temp directory */ long totalterms; /* total inverted index terms */ BOOL trun_syms; /* truncate symbols to 8 characters */ *************** *** 132,135 **** --- 133,137 ---- pid_t pid; struct stat stat_buf; + mode_t orig_umask; yyin = stdin; *************** *** 331,337 **** /* create the temporary file names */ pid = getpid(); ! (void) sprintf(temp1, "%s/cscope%d.1", tmpdir, pid); ! (void) sprintf(temp2, "%s/cscope%d.2", tmpdir, pid); /* if running in the foreground */ --- 333,348 ---- /* create the temporary file names */ + orig_umask = umask(S_IRWXG|S_IRWXO); pid = getpid(); ! (void) sprintf(tempdirpv, "%s/cscope.%d", tmpdir, pid); ! if(mkdir(tempdirpv,S_IRWXU)) ! { ! fprintf(stderr, "cscope: Could not create private temp dir %s\n",tempdirpv); ! myexit(1); ! } ! umask(orig_umask); ! ! (void) sprintf(temp1, "%s/cscope.1", tempdirpv, pid); ! (void) sprintf(temp2, "%s/cscope.2", tempdirpv, pid); /* if running in the foreground */ *************** *** 835,838 **** --- 846,850 ---- (void) unlink(temp1); (void) unlink(temp2); + (void) rmdir(tempdirpv); } /* restore the terminal to its original mode */ |
From: Hans-Bernhard B. <br...@us...> - 2004-11-29 12:50:33
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1257 Modified Files: ChangeLog Log Message: Fix up an inconvenience in the man page Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -r1.139 -r1.140 *** ChangeLog 27 Oct 2004 11:32:45 -0000 1.139 --- ChangeLog 29 Nov 2004 12:50:21 -0000 1.140 *************** *** 1,2 **** --- 1,7 ---- + 2004-11-22 Hans-Bernhard Broeker <br...@ph...> + + * doc/cscope.1: Make ESR happy: change man page summary section to + avoid [0-9] syntax. + 2004-10-27 Hans-Bernhard Broeker <br...@ac...> |
From: Hans-Bernhard B. <br...@us...> - 2004-11-29 12:50:33
|
Update of /cvsroot/cscope/cscope/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1257/doc Modified Files: cscope.1 Log Message: Fix up an inconvenience in the man page Index: cscope.1 =================================================================== RCS file: /cvsroot/cscope/cscope/doc/cscope.1,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** cscope.1 14 Aug 2003 14:37:48 -0000 1.18 --- cscope.1 29 Nov 2004 12:50:21 -0000 1.19 *************** *** 10,14 **** .BI [\-I incdir ] .BI [\-i namefile ] ! .BI [\-[ 0-9 ] pattern ] .BI [\-p n ] .BI [\-s dir ] --- 10,14 ---- .BI [\-I incdir ] .BI [\-i namefile ] ! .BI [\-[ 0123456789 ] pattern ] .BI [\-p n ] .BI [\-s dir ] |
From: Hans-Bernhard B. <br...@us...> - 2004-10-27 11:32:56
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28719/src Modified Files: global.h display.c command.c Log Message: Fix column layout for long file/fcn names. Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** global.h 30 Apr 2004 15:31:42 -0000 1.31 --- global.h 27 Oct 2004 11:32:46 -0000 1.32 *************** *** 350,353 **** --- 350,354 ---- void clearmsg(void); void clearmsg2(void); + void countrefs(void); void crossref(char *srcfile); void dispinit(void); Index: display.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/display.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** display.c 30 Apr 2004 15:29:04 -0000 1.25 --- display.c 27 Oct 2004 11:32:46 -0000 1.26 *************** *** 503,539 **** (void) ungetc(c, refsfound); ! /* count the references found and find the length of the file, ! function, and line number display fields */ ! subsystemlen = 9; /* strlen("Subsystem") */ ! booklen = 4; /* strlen("Book") */ ! filelen = 4; /* strlen("File") */ ! fcnlen = 8; /* strlen("Function") */ ! numlen = 0; ! while (fscanf(refsfound, "%s%s%s", file, function, linenum) == 3) { ! if ((i = strlen(pathcomponents(file, dispcomponents))) > filelen) { ! filelen = i; ! } ! if (ogs == YES) { ! ogsnames(file, &subsystem, &book); ! if ((i = strlen(subsystem)) > subsystemlen) { ! subsystemlen = i; ! } ! if ((i = strlen(book)) > booklen) { ! booklen = i; ! } ! } ! if ((i = strlen(function)) > fcnlen) { ! fcnlen = i; ! } ! if ((i = strlen(linenum)) > numlen) { ! numlen = i; ! } ! /* skip the line text */ ! while ((c = getc(refsfound)) != EOF && c != '\n') { ! ; ! } ! ++totallines; ! } ! rewind(refsfound); return(YES); } --- 503,510 ---- (void) ungetc(c, refsfound); ! /* HBB 20041027: this used to hold a copy of the code of ! * countrefs(), but with the crucial display width adjustments ! * missing. Just call the real thing instead! */ ! countrefs(); return(YES); } Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** command.c 30 Apr 2004 15:24:18 -0000 1.23 --- command.c 27 Oct 2004 11:32:46 -0000 1.24 *************** *** 70,74 **** static void mark(int i); static void scrollbar(MOUSE *p); - static void countrefs(void); /* execute the command */ --- 70,73 ---- *************** *** 868,872 **** /* count the references found */ ! static void countrefs(void) { --- 867,871 ---- /* count the references found */ ! void countrefs(void) { |
From: Hans-Bernhard B. <br...@us...> - 2004-10-27 11:32:56
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28719 Modified Files: ChangeLog Log Message: Fix column layout for long file/fcn names. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -r1.138 -r1.139 *** ChangeLog 23 Jun 2004 15:41:58 -0000 1.138 --- ChangeLog 27 Oct 2004 11:32:45 -0000 1.139 *************** *** 1,2 **** --- 1,13 ---- + 2004-10-27 Hans-Bernhard Broeker <br...@ac...> + + * src/display.c (search): Replace duplicated code by a call to + countrefs(). Duplicate lacked adjustment of column widths in case + of very long function/file names. Thanks to Darlene Wong for + spotting this. + + * src/global.h (countrefs): Prototype added. + + * src/command.c (countrefs): Made globally available. + 2004-06-23 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2004-06-23 15:42:13
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30383/src Modified Files: dir.c Log Message: Fix internal cursor movement in parsing of quoted filenames. Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** dir.c 15 Oct 2003 14:09:30 -0000 1.20 --- dir.c 23 Jun 2004 15:41:59 -0000 1.21 *************** *** 288,292 **** else { (void) fprintf(stderr, "cscope: cannot find file %s\n", ! file); errorsfound = YES; } --- 288,292 ---- else { (void) fprintf(stderr, "cscope: cannot find file %s\n", ! file); errorsfound = YES; } *************** *** 295,469 **** return; } /* see if a file name file exists */ if (namefile == NULL && vpaccess(NAMEFILE, READ) == 0) { namefile = NAMEFILE; } ! /* if there is a file of source file names */ ! if (namefile != NULL) { ! if (strcmp(namefile, "-") == 0) ! names = stdin; ! else if ((names = vpfopen(namefile, "r")) == NULL) { ! cannotopen(namefile); ! myexit(1); ! } ! /* get the names in the file */ ! while (fgets(line, 10*PATHLEN, names) != NULL) { ! char *point_in_line = line + (strlen(line) - 1); ! size_t length_of_name = 0; ! int unfinished_option = 0; ! BOOL done = NO; ! ! /* Kill away \n left at end of fgets()'d string: */ ! if (*point_in_line == '\n') ! *point_in_line = '\0'; ! /* Parse whitespace-terminated strings in line: */ ! point_in_line = line; ! while (sscanf(point_in_line, "%s", path) == 1) { ! /* Have to store this length --- inviewpath() will ! * modify path, later! */ ! length_of_name = strlen(path); ! if (*path == '-') { /* if an option */ ! if (unfinished_option) { ! /* Can't have another option directly after an ! * -I or -p option with no name after it! */ ! (void) fprintf(stderr, "\ cscope: Syntax error in namelist file %s: unfinished -I or -p option\n", ! namefile); ! unfinished_option = 0; ! } ! i = path[1]; ! switch (i) { ! case 'c': /* ASCII characters only in crossref */ ! compress = NO; ! break; ! case 'k': /* ignore DFLT_INCDIR */ ! kernelmode = YES; ! break; ! case 'q': /* quick search */ ! invertedindex = YES; ! break; ! case 'T': /* truncate symbols to 8 characters */ ! trun_syms = YES; ! break; ! case 'I': /* #include file directory */ ! case 'p': /* file path components to display */ ! s = path + 2; /* for "-Ipath" */ ! if (*s == '\0') { /* if "-I path" */ ! unfinished_option = i; ! break; ! } ! ! /* this code block used several times in here ! * --> make it a macro to avoid unnecessary ! * duplication */ ! #define HANDLE_OPTION_ARGUMENT(i, s) \ ! switch (i) { \ ! case 'I': /* #include file directory */ \ ! if (firstbuild == YES) { \ ! /* expand $ and ~ */ \ ! shellpath(dir, sizeof(dir), (s)); \ ! includedir(dir); \ ! } \ ! unfinished_option = 0; \ ! done = YES; \ ! break; \ ! case 'p': /* file path components to display */ \ ! if (*(s) < '0' || *(s) > '9') { \ ! (void) fprintf(stderr, \ ! "cscope: -p option in file %s: missing or invalid numeric value\n", \ ! namefile); \ ! } \ ! dispcomponents = atoi(s); \ ! unfinished_option = 0; \ ! done = YES; \ ! break; \ ! default: \ ! done = NO; \ ! } ! /* ... and now call it for the first time */ ! HANDLE_OPTION_ARGUMENT(i, s) break; ! default: ! (void) fprintf(stderr, "cscope: only -I, -c, -k, -p, and -T options can be in file %s\n", ! namefile); ! } ! } else if (*path == '"') { ! /* handle quoted filenames... */ ! size_t in = 1, out = 0; ! char *newpath = mymalloc(PATHLEN + 1); ! ! while (in < PATHLEN && point_in_line[in] != '\0') { ! if (point_in_line[in] == '"') { ! newpath[out] = '\0'; ! /* Make sure we skip over the part just read */ ! point_in_line += in + 1; ! /* ... to deactive step by strlen() path at end ! * of loop */ ! path[0]='\0'; ! break; /* found end of quoted string */ ! } ! else if (point_in_line[in] == '\\' && in < PATHLEN - 1 ! && (point_in_line[in + 1]== '"' || point_in_line[in + 1] == '\\')) { ! /* un-escape \" or \\ sequence */ ! newpath[out++] = point_in_line[in + 1]; ! in += 2; ! } ! else { ! newpath[out++] = point_in_line[in++]; ! } ! } /* while */ ! if (in >= PATHLEN) { /* safeguard against almost-overflow */ ! newpath[out]='\0'; } ! /* If an -I or -p arguments was missing before, ! * treat this name as the argument: */ ! HANDLE_OPTION_ARGUMENT(unfinished_option, newpath); ! if (! done) { ! if ((s = inviewpath(newpath)) != NULL) { ! addsrcfile(s); ! } else { ! (void) fprintf(stderr, ! "cscope: cannot find file %s\n", ! newpath); ! errorsfound = YES; ! } } ! } else { ! /* ... so this is an ordinary file name, unquoted */ ! ! /* If an -I or -p arguments was missing before, ! * treat this name as the argument: */ ! HANDLE_OPTION_ARGUMENT(unfinished_option, path); ! if (!done) { ! if ((s = inviewpath(path)) != NULL) { ! addsrcfile(s); ! } else { ! (void) fprintf(stderr, "cscope: cannot find file %s\n", ! path); ! errorsfound = YES; ! } } } ! point_in_line += length_of_name; ! while (isspace((unsigned char) *point_in_line)) ! point_in_line ++; ! } ! } ! if (names == stdin) ! clearerr(stdin); ! else ! (void) fclose(names); ! firstbuild = NO; ! return; ! } ! /* make a list of all the source files in the directories */ ! for (i = 0; i < nsrcdirs; ++i) { ! scan_dir(srcdirs[i], recurse_dir); ! } } --- 295,478 ---- return; } + /* see if a file name file exists */ if (namefile == NULL && vpaccess(NAMEFILE, READ) == 0) { namefile = NAMEFILE; } ! ! if (namefile == NULL) { ! /* No namefile --> make a list of all the source files ! * in the directories */ ! for (i = 0; i < nsrcdirs; ++i) { ! scan_dir(srcdirs[i], recurse_dir); ! } ! return; ! } ! ! /* Came here --> there is a file of source file names */ ! ! if (strcmp(namefile, "-") == 0) ! names = stdin; ! else if ((names = vpfopen(namefile, "r")) == NULL) { ! cannotopen(namefile); ! myexit(1); ! } ! ! /* get the names in the file */ ! while (fgets(line, 10*PATHLEN, names) != NULL) { ! char *point_in_line = line + (strlen(line) - 1); ! size_t length_of_name = 0; ! int unfinished_option = 0; ! BOOL done = NO; ! ! /* Kill away \n left at end of fgets()'d string: */ ! if (*point_in_line == '\n') ! *point_in_line = '\0'; ! /* Parse whitespace-terminated strings in line: */ ! point_in_line = line; ! while (sscanf(point_in_line, "%s", path) == 1) { ! /* Have to store this length --- inviewpath() will ! * modify path, later! */ ! length_of_name = strlen(path); ! if (*path == '-') { /* if an option */ ! if (unfinished_option) { ! /* Can't have another option directly after an ! * -I or -p option with no name after it! */ ! (void) fprintf(stderr, "\ cscope: Syntax error in namelist file %s: unfinished -I or -p option\n", ! namefile); ! unfinished_option = 0; ! } ! i = path[1]; ! switch (i) { ! case 'c': /* ASCII characters only in crossref */ ! compress = NO; ! break; ! case 'k': /* ignore DFLT_INCDIR */ ! kernelmode = YES; ! break; ! case 'q': /* quick search */ ! invertedindex = YES; ! break; ! case 'T': /* truncate symbols to 8 characters */ ! trun_syms = YES; ! break; ! case 'I': /* #include file directory */ ! case 'p': /* file path components to display */ ! s = path + 2; /* for "-Ipath" */ ! if (*s == '\0') { /* if "-I path" */ ! unfinished_option = i; ! break; ! } ! ! /* this code block used several times in here ! * --> make it a macro to avoid unnecessary ! * duplication */ ! #define HANDLE_OPTION_ARGUMENT(i, s) \ ! switch (i) { \ ! case 'I': /* #include file directory */ \ ! if (firstbuild == YES) { \ ! /* expand $ and ~ */ \ ! shellpath(dir, sizeof(dir), (s)); \ ! includedir(dir); \ ! } \ ! unfinished_option = 0; \ ! done = YES; \ ! break; \ ! case 'p': /* file path components to display */ \ ! if (*(s) < '0' || *(s) > '9') { \ ! (void) fprintf(stderr, \ ! "cscope: -p option in file %s: missing or invalid numeric value\n", \ ! namefile); \ ! } \ ! dispcomponents = atoi(s); \ ! unfinished_option = 0; \ ! done = YES; \ ! break; \ ! default: \ ! done = NO; \ ! } /* switch(i) */ ! /* ... and now call it for the first time */ ! HANDLE_OPTION_ARGUMENT(i, s) break; ! default: ! (void) fprintf(stderr, "cscope: only -I, -c, -k, -p, and -T options can be in file %s\n", ! namefile); ! } /* switch(i) */ ! } /* if('-') */ ! else if (*path == '"') { ! /* handle quoted filenames... */ ! size_t in = 1, out = 0; ! char *newpath = mymalloc(PATHLEN + 1); ! ! while (in < PATHLEN && point_in_line[in] != '\0') { ! if (point_in_line[in] == '"') { ! newpath[out] = '\0'; ! /* Tell outer loop to skip over this entire quoted string */ ! length_of_name = in + 1; ! break; /* found end of quoted string */ ! } else if (point_in_line[in] == '\\' ! && in < PATHLEN - 1 ! && (point_in_line[in + 1]== '"' ! || point_in_line[in + 1] == '\\')) { ! /* un-escape \" or \\ sequence */ ! newpath[out++] = point_in_line[in + 1]; ! in += 2; ! } else { ! newpath[out++] = point_in_line[in++]; } + } /* while(in) */ + if (in >= PATHLEN) { /* safeguard against almost-overflow */ + newpath[out]='\0'; + } ! /* If an -I or -p arguments was missing before, ! * treat this name as the argument: */ ! HANDLE_OPTION_ARGUMENT(unfinished_option, newpath); ! if (! done) { ! if ((s = inviewpath(newpath)) != NULL) { ! addsrcfile(s); ! } else { ! (void) fprintf(stderr, ! "cscope: cannot find file %s\n", ! newpath); ! errorsfound = YES; } ! } ! } /* if(quoted name) */ ! else { ! /* ... so this is an ordinary file name, unquoted */ ! ! /* If an -I or -p arguments was missing before, ! * treat this name as the argument: */ ! HANDLE_OPTION_ARGUMENT(unfinished_option, path); ! if (!done) { ! if ((s = inviewpath(path)) != NULL) { ! addsrcfile(s); ! } else { ! (void) fprintf(stderr, "cscope: cannot find file %s\n", ! path); ! errorsfound = YES; } } ! } /* else(ordinary name) */ ! ! point_in_line += length_of_name; ! while (isspace((unsigned char) *point_in_line)) ! point_in_line ++; ! } /* while(sscanf(line)) */ ! } /* while(fgets(line)) */ ! ! if (names == stdin) ! clearerr(stdin); ! else ! (void) fclose(names); ! firstbuild = NO; ! return; ! } |
From: Hans-Bernhard B. <br...@us...> - 2004-06-23 15:42:13
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30383 Modified Files: ChangeLog Log Message: Fix internal cursor movement in parsing of quoted filenames. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -r1.137 -r1.138 *** ChangeLog 21 Jun 2004 18:13:21 -0000 1.137 --- ChangeLog 23 Jun 2004 15:41:58 -0000 1.138 *************** *** 1,2 **** --- 1,8 ---- + 2004-06-23 Hans-Bernhard Broeker <br...@ph...> + + * src/dir.c (makefilelist): Fix broken movement of point_in_line + when parsing quoted names. Simplify structure by moving default + handling upward. + 2004-06-21 Hans-Bernhard Broeker <br...@ph...> *************** *** 27,31 **** * src/input.c (mygetline): New function. Poor-man's readline ! imitation. * src/global.h (mygetline): Prototype added. --- 33,37 ---- * src/input.c (mygetline): New function. Poor-man's readline ! imitation. From SF Patch #937310. * src/global.h (mygetline): Prototype added. |
From: Hans-Bernhard B. <br...@us...> - 2004-06-21 18:13:31
|
Update of /cvsroot/cscope/cscope/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6716/contrib Modified Files: ocs Log Message: Make ocs system cscope datafile storage directory configurable. Index: ocs =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/ocs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ocs 22 May 2001 15:40:31 -0000 1.3 --- ocs 21 Jun 2004 18:13:21 -0000 1.4 *************** *** 72,78 **** CSCOPE=cscope - SYSDIR=/usr/local/lib/cs HOMEDIR=${HOME}/lib/cs # Check that cscope is in PATH type cscope 1>/dev/null 2>&1 --- 72,90 ---- CSCOPE=cscope HOMEDIR=${HOME}/lib/cs + #set the default value for SYSDIR + if [ -z "${SYSDIR}" ]; then + SYSDIR=/usr/local/lib/cs + echo setting default sysdir + fi + + #check that SYSDIR exists + if [ ! -d ${SYSDIR} ]; then + echo -n $SYSDIR does not exist. + echo Please create the directory and set SYSDIR appropriately + exit + fi + # Check that cscope is in PATH type cscope 1>/dev/null 2>&1 |
From: Hans-Bernhard B. <br...@us...> - 2004-06-21 18:13:30
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6716 Modified Files: ChangeLog Log Message: Make ocs system cscope datafile storage directory configurable. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -r1.136 -r1.137 *** ChangeLog 30 Apr 2004 15:31:42 -0000 1.136 --- ChangeLog 21 Jun 2004 18:13:21 -0000 1.137 *************** *** 1,2 **** --- 1,8 ---- + 2004-06-21 Hans-Bernhard Broeker <br...@ph...> + + * contrib/ocs (SYSDIR): Only set to /usr/local/lib/cs if not + already set in outside environment. Check that $(SYSDIR) exists + before proceeding. From SF patch #976788 by Neil Horman. + 2004-04-30 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:31:52
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888/src Modified Files: build.c global.h main.c vp.h Log Message: Updates driven by previous changes today. Index: build.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/build.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** build.c 8 Jan 2004 14:07:20 -0000 1.6 --- build.c 30 Apr 2004 15:31:42 -0000 1.7 *************** *** 321,325 **** /* get the first file name in the old cross-reference */ blocknumber = -1; ! (void) readblock(); /* read the first cross-ref block */ (void) scanpast('\t'); /* skip the header */ oldfile = getoldfile(); --- 321,325 ---- /* get the first file name in the old cross-reference */ blocknumber = -1; ! (void) read_block(); /* read the first cross-ref block */ (void) scanpast('\t'); /* skip the header */ oldfile = getoldfile(); *************** *** 601,610 **** dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = readblock()) != NULL); dbputc('\t'); /* copy the tab */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = readblock(); } /* exit if at the end of this file's data */ --- 601,610 ---- dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = read_block()) != NULL); dbputc('\t'); /* copy the tab */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = read_block(); } /* exit if at the end of this file's data */ *************** *** 644,653 **** dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = readblock()) != NULL); dbputc('\n'); /* copy the newline */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = readblock(); } /* exit if at the end of this file's data */ --- 644,653 ---- dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = read_block()) != NULL); dbputc('\n'); /* copy the newline */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = read_block(); } /* exit if at the end of this file's data */ Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** global.h 30 Apr 2004 12:09:14 -0000 1.30 --- global.h 30 Apr 2004 15:31:42 -0000 1.31 *************** *** 262,266 **** extern int curdispline; extern char newpat[]; /* new pattern */ ! extern char pattern[]; /* symbol or text pattern */ /* crossref.c global data */ --- 262,266 ---- extern int curdispline; extern char newpat[]; /* new pattern */ ! extern char Pattern[]; /* symbol or text pattern */ /* crossref.c global data */ *************** *** 336,340 **** char *lookup(char *ident); char *pathcomponents(char *path, int components); ! char *readblock(void); char *scanpast(char c); --- 336,340 ---- char *lookup(char *ident); char *pathcomponents(char *path, int components); ! char *read_block(void); char *scanpast(char c); Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** main.c 8 Jan 2004 14:07:20 -0000 1.32 --- main.c 30 Apr 2004 15:31:43 -0000 1.33 *************** *** 173,177 **** /* NOTREACHED */ } ! (void) strcpy(pattern, s); goto nextarg; } --- 173,177 ---- /* NOTREACHED */ } ! (void) strcpy(Pattern, s); goto nextarg; } *************** *** 373,380 **** #if TERMINFO (void) keypad(stdscr, TRUE); /* enable the keypad */ ! #ifdef HAVE_FIXKEYPAD fixkeypad(); /* fix for getch() intermittently returning garbage */ ! #endif ! #endif #if UNIXPC standend(); /* turn off reverse video */ --- 373,380 ---- #if TERMINFO (void) keypad(stdscr, TRUE); /* enable the keypad */ ! # ifdef HAVE_FIXKEYPAD fixkeypad(); /* fix for getch() intermittently returning garbage */ ! # endif ! #endif /* TERMINFO */ #if UNIXPC standend(); /* turn off reverse video */ *************** *** 546,550 **** subprocess to emacs or samuel */ if (linemode == YES) { ! if (*pattern != '\0') { /* do any optional search */ if (search() == YES) { while ((c = getc(refsfound)) != EOF) { --- 546,550 ---- subprocess to emacs or samuel */ if (linemode == YES) { ! if (*Pattern != '\0') { /* do any optional search */ if (search() == YES) { while ((c = getc(refsfound)) != EOF) { *************** *** 580,584 **** case '9': /* samuel only */ field = *buf - '0'; ! (void) strcpy(pattern, buf + 1); (void) search(); (void) printf("cscope: %d lines\n", totallines); --- 580,584 ---- case '9': /* samuel only */ field = *buf - '0'; ! (void) strcpy(Pattern, buf + 1); (void) search(); (void) printf("cscope: %d lines\n", totallines); *************** *** 642,651 **** } /* do any optional search */ ! if (*pattern != '\0') { atfield(); /* move to the input field */ (void) command(ctrl('Y')); /* search */ ! } ! /* read any symbol reference lines file */ ! else if (reflines != NULL) { (void) readrefs(reflines); } --- 642,650 ---- } /* do any optional search */ ! if (*Pattern != '\0') { atfield(); /* move to the input field */ (void) command(ctrl('Y')); /* search */ ! } else if (reflines != NULL) { ! /* read any symbol reference lines file */ (void) readrefs(reflines); } Index: vp.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/vp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vp.h 15 Sep 2003 10:59:05 -0000 1.6 --- vp.h 30 Apr 2004 15:31:43 -0000 1.7 *************** *** 66,70 **** extern int vpndirs; /* number of directories in view path */ ! void vpinit(char *currentdir); int vpopen(char *path, int oflag); int vpaccess(char *path, mode_t amode); --- 66,70 ---- extern int vpndirs; /* number of directories in view path */ ! void vpinit(char *current_dir); int vpopen(char *path, int oflag); int vpaccess(char *path, mode_t amode); |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:31:50
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888 Modified Files: ChangeLog Log Message: Updates driven by previous changes today. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -r1.135 -r1.136 *** ChangeLog 30 Apr 2004 12:09:14 -0000 1.135 --- ChangeLog 30 Apr 2004 15:31:42 -0000 1.136 *************** *** 1,4 **** --- 1,23 ---- 2004-04-30 Hans-Bernhard Broeker <br...@ph...> + * src/vpinit.c (vpinit): Renamed argument currentdir to + current_dir to avoid name clash with same-named global. + + * src/command.c (Pattern): Renamed from "pattern", to avoid + multitute of compiler warnings about shadowing by locally defined + variables of the same name. Changed all usages of this variable, + too. + (command): Test for individual KEY_* macros instead of TERMINFO + whenever one of the KEY_* macros is referenced. This should + reduce the TERMINFO mess a little. + + * src/find.c (read_block): Renamed from "readblock", to avoid name + clash with QNX system function of that name. Calls changed + accordingly, all over the place. + + * src/display.c: Fix fall-back definition of sigjmp_buf. + + * src/constants.h: Activate TERMINFO for FreeBSD. + * src/input.c (mygetline): New function. Poor-man's readline imitation. |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:31:05
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5701/src Modified Files: vpinit.c Log Message: Rename argument to avoid name clash with global variable. Index: vpinit.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/vpinit.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** vpinit.c 5 May 2000 17:51:45 -0000 1.5 --- vpinit.c 30 Apr 2004 15:30:51 -0000 1.6 *************** *** 53,57 **** void ! vpinit(char *currentdir) { char *suffix; /* path from view path node */ --- 53,57 ---- void ! vpinit(char *current_dir) { char *suffix; /* path from view path node */ *************** *** 66,70 **** /* if an existing directory list is to be updated, free it */ ! if (currentdir != NULL && vpndirs > 0) { #if !NOMALLOC for (i = 0; i < vpndirs; ++i) { --- 66,70 ---- /* if an existing directory list is to be updated, free it */ ! if (current_dir != NULL && vpndirs > 0) { #if !NOMALLOC for (i = 0; i < vpndirs; ++i) { *************** *** 82,98 **** } /* if not given, get the current directory name */ ! if (currentdir == NULL && (currentdir = getcwd(buf, MAXPATH)) == NULL) { (void) fprintf(stderr, "%s: cannot get current directory name\n", argv0); return; } /* see if this directory is in the first view path node */ ! for (i = 0; vpath[i] == currentdir[i] && vpath[i] != '\0'; ++i) { ; } if ((vpath[i] != ':' && vpath[i] != '\0') || ! (currentdir[i] != '/' && currentdir[i] != '\0')) { return; } ! suffix = ¤tdir[i]; #if !NOMALLOC --- 82,98 ---- } /* if not given, get the current directory name */ ! if (current_dir == NULL && (current_dir = getcwd(buf, MAXPATH)) == NULL) { (void) fprintf(stderr, "%s: cannot get current directory name\n", argv0); return; } /* see if this directory is in the first view path node */ ! for (i = 0; vpath[i] == current_dir[i] && vpath[i] != '\0'; ++i) { ; } if ((vpath[i] != ':' && vpath[i] != '\0') || ! (current_dir[i] != '/' && current_dir[i] != '\0')) { return; } ! suffix = ¤t_dir[i]; #if !NOMALLOC |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:29:17
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5309/src Modified Files: display.c Log Message: Fix type in fallback definition of sigjmp_buf. Index: display.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/display.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** display.c 12 Feb 2004 18:13:14 -0000 1.24 --- display.c 30 Apr 2004 15:29:04 -0000 1.25 *************** *** 58,62 **** # define sigsetjmp(a,b) setjmp(a) # define siglongjmp(a,b) longjmp(a,b) ! # typedef jmp_buf sigjmp_buf; #endif --- 58,62 ---- # define sigsetjmp(a,b) setjmp(a) # define siglongjmp(a,b) longjmp(a,b) ! typedef jmp_buf sigjmp_buf; #endif *************** *** 176,183 **** /* display the pattern */ if (changing == YES) { ! printw("Change \"%s\" to \"%s\"", pattern, newpat); } else { printw("%c%s: %s", toupper((unsigned char)fields[field].text2[0]), ! fields[field].text2 + 1, pattern); } /* display the column headings */ --- 176,183 ---- /* display the pattern */ if (changing == YES) { ! printw("Change \"%s\" to \"%s\"", Pattern, newpat); } else { printw("%c%s: %s", toupper((unsigned char)fields[field].text2[0]), ! fields[field].text2 + 1, Pattern); } /* display the column headings */ *************** *** 437,441 **** f = fields[field].findfcn; if (f == findregexp || f == findstring) { ! findresult = (*f)(pattern); } else { if ((nonglobalrefs = myfopen(temp2, "wb")) == NULL) { --- 437,441 ---- f = fields[field].findfcn; if (f == findregexp || f == findstring) { ! findresult = (*f)(Pattern); } else { if ((nonglobalrefs = myfopen(temp2, "wb")) == NULL) { *************** *** 443,449 **** return(NO); } ! if ((rc = findinit(pattern)) == NOERROR) { (void) dbseek(0L); /* read the first block */ ! findresult = (*f)(pattern); if (f == findcalledby) funcexist = (*findresult == 'y'); --- 443,449 ---- return(NO); } ! if ((rc = findinit(Pattern)) == NOERROR) { (void) dbseek(0L); /* read the first block */ ! findresult = (*f)(Pattern); if (f == findcalledby) funcexist = (*findresult == 'y'); *************** *** 483,500 **** if (findresult != NULL) { (void) sprintf(lastmsg, "Egrep %s in this pattern: %s", ! findresult, pattern); } else if (rc == NOTSYMBOL) { (void) sprintf(lastmsg, "This is not a C symbol: %s", ! pattern); } else if (rc == REGCMPERROR) { (void) sprintf(lastmsg, "Error in this regcomp(3) regular expression: %s", ! pattern); } else if (funcexist == NO) { (void) sprintf(lastmsg, "Function definition does not exist: %s", ! pattern); } else { (void) sprintf(lastmsg, "Could not find the %s: %s", ! fields[field].text2, pattern); } return(NO); --- 483,500 ---- if (findresult != NULL) { (void) sprintf(lastmsg, "Egrep %s in this pattern: %s", ! findresult, Pattern); } else if (rc == NOTSYMBOL) { (void) sprintf(lastmsg, "This is not a C symbol: %s", ! Pattern); } else if (rc == REGCMPERROR) { (void) sprintf(lastmsg, "Error in this regcomp(3) regular expression: %s", ! Pattern); } else if (funcexist == NO) { (void) sprintf(lastmsg, "Function definition does not exist: %s", ! Pattern); } else { (void) sprintf(lastmsg, "Could not find the %s: %s", ! fields[field].text2, Pattern); } return(NO); |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:28:34
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5128/src Modified Files: constants.h Log Message: Turn on TERMINFO for FreeBSD. Index: constants.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/constants.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** constants.h 11 Jul 2002 14:23:45 -0000 1.12 --- constants.h 30 Apr 2004 15:28:25 -0000 1.13 *************** *** 55,64 **** /* note that blockp is assumed not to be null */ #define getrefchar() (*(++blockp + 1) != '\0' ? *blockp : \ ! (readblock() != NULL ? *blockp : '\0')) /* skip the next character in the cross-reference */ /* note that blockp is assumed not to be null and that this macro will always be in a statement by itself */ ! #define skiprefchar() if (*(++blockp + 1) == '\0') (void) readblock() #define ESC '\033' /* escape character */ --- 55,64 ---- /* note that blockp is assumed not to be null */ #define getrefchar() (*(++blockp + 1) != '\0' ? *blockp : \ ! (read_block() != NULL ? *blockp : '\0')) /* skip the next character in the cross-reference */ /* note that blockp is assumed not to be null and that this macro will always be in a statement by itself */ ! #define skiprefchar() if (*(++blockp + 1) == '\0') (void) read_block() #define ESC '\033' /* escape character */ *************** *** 96,132 **** #define FIELDS 9 ! #if (BSD || V9) && !__NetBSD__ ! #define TERMINFO 0 /* no terminfo curses */ #else ! #define TERMINFO 1 #endif - #ifndef __FreeBSD__ /* Prevent search issues in cscope.out */ #if !TERMINFO ! #ifndef KEY_BREAK ! #define KEY_BREAK 0400 /* easier to define than to add #if around the use */ ! #endif ! #ifndef KEY_ENTER ! #define KEY_ENTER 0401 ! #endif ! #ifndef KEY_BACKSPACE ! #define KEY_BACKSPACE 0402 ! #endif ! ! #if !sun ! #define cbreak() crmode() /* name change */ ! #endif ! ! #if UNIXPC ! #define erasechar() (_tty.c_cc[VERASE]) /* equivalent */ ! #define killchar() (_tty.c_cc[VKILL]) /* equivalent */ ! #else ! #define erasechar() (_tty.sg_erase) /* equivalent */ ! #define killchar() (_tty.sg_kill) /* equivalent */ ! #endif /* if UNIXPC */ ! #endif /* if !TERMINFO */ - #endif /* ifndef __FreeBSD__ */ #endif /* CSCOPE_CONSTANTS_H */ --- 96,129 ---- #define FIELDS 9 ! #if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ ! # define TERMINFO 0 /* no terminfo curses */ #else ! # define TERMINFO 1 #endif #if !TERMINFO ! # ifndef KEY_BREAK ! # define KEY_BREAK 0400 /* easier to define than to add #if around the use */ ! # endif ! # ifndef KEY_ENTER ! # define KEY_ENTER 0401 ! # endif ! # ifndef KEY_BACKSPACE ! # define KEY_BACKSPACE 0402 ! # endif ! ! # if !sun ! # define cbreak() crmode() /* name change */ ! # endif ! ! # if UNIXPC ! # define erasechar() (_tty.c_cc[VERASE]) /* equivalent */ ! # define killchar() (_tty.c_cc[VKILL]) /* equivalent */ ! # else ! # define erasechar() (_tty.sg_erase) /* equivalent */ ! # define killchar() (_tty.sg_kill) /* equivalent */ ! # endif /* if UNIXPC */ #endif /* if !TERMINFO */ #endif /* CSCOPE_CONSTANTS_H */ |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:26:25
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4678 Modified Files: find.c Log Message: Renamed readblock() to read_block, avoiding a name clash with the QNX system libraries. Index: find.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/find.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** find.c 8 Jan 2004 14:07:20 -0000 1.16 --- find.c 30 Apr 2004 15:26:17 -0000 1.17 *************** *** 126,134 **** ++cp; } ! } while (*(cp + 1) == '\0' && (cp = readblock()) != NULL); /* skip the found character */ if (cp != NULL && *(++cp + 1) == '\0') { ! cp = readblock(); } if (cp == NULL) { --- 126,134 ---- ++cp; } ! } while (*(cp + 1) == '\0' && (cp = read_block()) != NULL); /* skip the found character */ if (cp != NULL && *(++cp + 1) == '\0') { ! cp = read_block(); } if (cp == NULL) { *************** *** 738,742 **** ++i; } ! } while (*(blockp + 1) == '\0' && readblock() != NULL); if (*blockp == '\n' && cpattern[i] == '\0') { --- 738,742 ---- ++i; } ! } while (*(blockp + 1) == '\0' && read_block() != NULL); if (*blockp == '\n' && cpattern[i] == '\0') { *************** *** 853,857 **** ++cp; } ! } while (*(cp + 1) == '\0' && (cp = readblock()) != NULL); blockp = cp; } --- 853,857 ---- ++cp; } ! } while (*(cp + 1) == '\0' && (cp = read_block()) != NULL); blockp = cp; } *************** *** 879,883 **** ++cp; } ! } while (*(cp + 1) == '\0' && (cp = readblock()) != NULL); blockp = cp; *s = '\0'; --- 879,883 ---- ++cp; } ! } while (*(cp + 1) == '\0' && (cp = read_block()) != NULL); blockp = cp; *s = '\0'; *************** *** 885,889 **** /* scan past the next occurence of this character in the cross-reference */ ! char * scanpast(char c) { --- 885,889 ---- /* scan past the next occurence of this character in the cross-reference */ ! char * scanpast(char c) { *************** *** 896,900 **** ++cp; } ! } while (*(cp + 1) == '\0' && (cp = readblock()) != NULL); blockp = cp; if (cp != NULL) { --- 896,900 ---- ++cp; } ! } while (*(cp + 1) == '\0' && (cp = read_block()) != NULL); blockp = cp; if (cp != NULL) { *************** *** 905,911 **** /* read a block of the cross-reference */ ! ! char * ! readblock(void) { /* read the next block */ --- 905,911 ---- /* read a block of the cross-reference */ ! /* HBB 20040430: renamed from readblock(), to avoid name clash on QNX */ ! char * ! read_block(void) { /* read the next block */ *************** *** 1149,1153 **** return(rc); } ! (void) readblock(); blocknumber = n; } --- 1149,1153 ---- return(rc); } ! (void) read_block(); blocknumber = n; } |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:24:29
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4086 Modified Files: command.c Log Message: * Renamed global variable 'pattern' to 'Pattern' to reduce name clashes with local variables * Check existence of KEY_* macros themselves when using them, not the blanket definition TERMINFO. Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** command.c 30 Apr 2004 12:09:14 -0000 1.22 --- command.c 30 Apr 2004 15:24:18 -0000 1.23 *************** *** 56,60 **** BOOL changing; /* changing text */ char newpat[PATLEN + 1]; /* new pattern */ ! char pattern[PATLEN + 1]; /* symbol or text pattern */ static char appendprompt[] = "Append to file: "; --- 56,62 ---- BOOL changing; /* changing text */ char newpat[PATLEN + 1]; /* new pattern */ ! /* HBB 20040430: renamed to avoid lots of clashes with function arguments ! * also named 'pattern' */ ! char Pattern[PATLEN + 1]; /* symbol or text pattern */ static char appendprompt[] = "Append to file: "; *************** *** 175,179 **** return(NO); ! #if TERMINFO case KEY_ENTER: #endif --- 177,181 ---- return(NO); ! #ifdef KEY_ENTER case KEY_ENTER: #endif *************** *** 188,193 **** case ctrl('N'): ! #if TERMINFO case KEY_DOWN: case KEY_RIGHT: #endif --- 190,197 ---- case ctrl('N'): ! #ifdef KEY_DOWN case KEY_DOWN: + #endif + #ifdef KEY_RIGHT case KEY_RIGHT: #endif *************** *** 210,215 **** case ctrl('P'): /* go to previous input field */ ! #if TERMINFO case KEY_UP: case KEY_LEFT: #endif --- 214,221 ---- case ctrl('P'): /* go to previous input field */ ! #ifdef KEY_UP case KEY_UP: + #endif + #ifdef KEY_LEFT case KEY_LEFT: #endif *************** *** 230,234 **** } return(NO); ! #if TERMINFO case KEY_HOME: /* go to first input field */ if (selecting) --- 236,240 ---- } return(NO); ! #ifdef KEY_HOME case KEY_HOME: /* go to first input field */ if (selecting) *************** *** 261,269 **** } return(NO); ! #endif case ' ': /* display next page */ case '+': case ctrl('V'): ! #if TERMINFO case KEY_NPAGE: #endif --- 267,275 ---- } return(NO); ! #endif /* def(KEY_HOME) */ case ' ': /* display next page */ case '+': case ctrl('V'): ! #ifdef KEY_NPAGE case KEY_NPAGE: #endif *************** *** 281,285 **** case ctrl('H'): case '-': /* display previous page */ ! #if TERMINFO case KEY_PPAGE: #endif --- 287,291 ---- case ctrl('H'): case '-': /* display previous page */ ! #ifdef KEY_PPAGE case KEY_PPAGE: #endif *************** *** 407,411 **** case ctrl('L'): /* redraw screen */ ! #if TERMINFO case KEY_CLEAR: #endif --- 413,417 ---- case ctrl('L'): /* redraw screen */ ! #ifdef KEY_CLEAR case KEY_CLEAR: #endif *************** *** 433,438 **** case ctrl('Y'): /* repeat last pattern */ ! if (*pattern != '\0') { ! (void) addstr(pattern); goto repeat; } --- 439,444 ---- case ctrl('Y'): /* repeat last pattern */ ! if (*Pattern != '\0') { ! (void) addstr(Pattern); goto repeat; } *************** *** 455,459 **** atfield(); (void) addstr(item->text); ! (void) strcpy(pattern, item->text); switch (c = mygetch()) { case '\r': --- 461,465 ---- atfield(); (void) addstr(item->text); ! (void) strcpy(Pattern, item->text); switch (c = mygetch()) { case '\r': *************** *** 468,473 **** default: (void) myungetch(c); ! if (mygetline(pattern, newpat, COLS - fldcolumn - 1, '\0', caseless )) { ! strcpy (pattern, newpat); resetcmd(); } --- 474,479 ---- default: (void) myungetch(c); ! if (mygetline(Pattern, newpat, COLS - fldcolumn - 1, '\0', caseless )) { ! strcpy (Pattern, newpat); resetcmd(); } *************** *** 506,513 **** ispat: if (getline(newpat, COLS - fldcolumn - 1, commandc, caseless) > 0) { ! (void) strcpy(pattern, newpat); resetcmd(); /* reset command history */ repeat: ! addcmd(field, pattern); /* add to command history */ if (field == CHANGE) { --- 512,519 ---- ispat: if (getline(newpat, COLS - fldcolumn - 1, commandc, caseless) > 0) { ! (void) strcpy(Pattern, newpat); resetcmd(); /* reset command history */ repeat: ! addcmd(field, Pattern); /* add to command history */ if (field == CHANGE) { *************** *** 628,632 **** /* get a character from the terminal */ ! if ((c = mygetch()) == EOF || c == ctrl('D') || c == ctrl('Z')) { break; /* change lines */ } --- 634,640 ---- /* get a character from the terminal */ ! if ((c = mygetch()) == EOF ! || c == ctrl('D') ! || c == ctrl('Z')) { break; /* change lines */ } *************** *** 636,644 **** case '+': case ctrl('V'): ! #if TERMINFO case KEY_NPAGE: #endif case '-': /* display previous page */ ! #if TERMINFO case KEY_PPAGE: #endif --- 644,652 ---- case '+': case ctrl('V'): ! #ifdef KEY_NPAGE case KEY_NPAGE: #endif case '-': /* display previous page */ ! #ifdef KEY_PPAGE case KEY_PPAGE: #endif *************** *** 649,653 **** case ctrl('L'): /* redraw screen */ ! #if TERMINFO case KEY_CLEAR: #endif --- 657,661 ---- case ctrl('L'): /* redraw screen */ ! #ifdef KEY_CLEAR case KEY_CLEAR: #endif *************** *** 743,747 **** /* output substitute command */ (void) fprintf(script, "%ss/", linenum); /* change */ ! for (s = pattern; *s != '\0'; ++s) { /* old text */ if (strchr("/\\[.^*", *s) != NULL) { (void) putc('\\', script); --- 751,756 ---- /* output substitute command */ (void) fprintf(script, "%ss/", linenum); /* change */ ! for (s = Pattern; *s != '\0'; ++s) { ! /* old text */ if (strchr("/\\[.^*", *s) != NULL) { (void) putc('\\', script); |
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 12:09:24
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23688 Modified Files: ChangeLog Log Message: Make input fields editable after recalling them from history (Ctrl-B/F). Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -r1.134 -r1.135 *** ChangeLog 24 Feb 2004 15:13:20 -0000 1.134 --- ChangeLog 30 Apr 2004 12:09:14 -0000 1.135 *************** *** 1,2 **** --- 1,16 ---- + 2004-04-30 Hans-Bernhard Broeker <br...@ph...> + + * src/input.c (mygetline): New function. Poor-man's readline + imitation. + + * src/global.h (mygetline): Prototype added. + + * src/command.c (command): Use mygetline() instead of letting + ncsurses doing it all. Make Ctrl-B/F special hotkeys that are + handled here instead of in mygetline(), to preserve their meaning. + + * packages/cscope.spec: Updated by SF patch #920586 to be more + compatible with current expectations. + 2004-02-24 Hans-Bernhard Broeker <br...@ph...> |