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
|
|
From: Neil Horman <nhorman@us...> - 2009-12-14 13:52:01
|
Update of /cvsroot/cscope/cscope In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5592 Modified Files: ChangeLog Log Message: Fixing argv/argc adjustment in parse_options Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.182 retrieving revision 1.183 diff -C2 -r1.182 -r1.183 *** ChangeLog 9 Dec 2009 20:29:34 -0000 1.182 --- ChangeLog 14 Dec 2009 13:51:49 -0000 1.183 *************** *** 1,2 **** --- 1,7 ---- + 2009-12-14 Neil Horman <nhorman@...> + * src/main.c: Fixed adjustments to argc/argv in parse_option to account + for the possibility that someone might specify multiple options in + one argument (-ab vs. -a -b) + 2009-12-09 Neil Horman <nhorman@...> |
|
From: Neil Horman <nhorman@us...> - 2009-12-09 20:29:48
|
Update of /cvsroot/cscope/cscope In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15371 Modified Files: AUTHORS ChangeLog Log Message: Resolving sf bug 2911623 Index: AUTHORS =================================================================== RCS file: /cvsroot/cscope/cscope/AUTHORS,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** AUTHORS 6 Dec 2004 14:56:42 -0000 1.33 --- AUTHORS 9 Dec 2009 20:29:34 -0000 1.34 *************** *** 32,34 **** David Cohrs - LEX and SUNOS scanner fix Valentin Podlovchenko - Overflow prevention and link recursion fix patch ! Neil Horman <nhorman@...> - Various Bug Fixes --- 32,34 ---- David Cohrs - LEX and SUNOS scanner fix Valentin Podlovchenko - Overflow prevention and link recursion fix patch ! Neil Horman <nhorman@...> - Various Bug Fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.181 retrieving revision 1.182 diff -C2 -r1.181 -r1.182 *** ChangeLog 28 Aug 2009 14:28:27 -0000 1.181 --- ChangeLog 9 Dec 2009 20:29:34 -0000 1.182 *************** *** 1,2 **** --- 1,11 ---- + 2009-12-09 Neil Horman <nhorman@...> + + * src/main.c: Added a new parse_options implementation to make option + parsing more sane and safe for systems which support getopt_long. Also + added a check to make sure that single character options didn't specify + trailing data (sf bug 2911623) + + * AUTHORS: Fixed my email address + 2009-08-28 Neil Horman <nhorman@...> |
|
From: Neil Horman <nhorman@us...> - 2009-12-09 20:29:44
|
Update of /cvsroot/cscope/cscope/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15371/src
Modified Files:
main.c
Log Message:
Resolving sf bug 2911623
Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** main.c 6 May 2009 14:41:51 -0000 1.47
--- main.c 9 Dec 2009 20:29:34 -0000 1.48
***************
*** 54,57 ****
--- 54,60 ----
#include <sys/stat.h> /* stat */
#include <signal.h>
+ #ifdef _GNU_SOURCE
+ #include <getopt.h>
+ #endif
/* defaults for unset environment variables */
***************
*** 134,137 ****
--- 137,258 ----
#endif
+ #ifdef _GNU_SOURCE
+ struct option lopts[] = {
+ {"help", 0, NULL, 'h'},
+ {"version", 0, NULL, 'V'},
+ {0, 0, 0, 0}
+ };
+
+ char ** parse_options(int *argc, char **argv)
+ {
+ int opt;
+ int optind;
+ char path[PATHLEN + 1]; /* file path */
+ char *s;
+ int args_handled = 1;
+ int argcc = *argc;
+
+
+ while ((opt = getopt_long(argcc, argv,
+ "hVbcCdeF:f:I:i:kLl0:1:2:3:4:5:6:7:8:9:P:p:qRs:TUuv",
+ lopts, &optind)) != -1) {
+ args_handled++;
+ switch(opt) {
+
+ case '?':
+ usage();
+ myexit(1);
+ break;
+ case 'b': /* only build the cross-reference */
+ buildonly = YES;
+ linemode = YES;
+ break;
+ case 'c': /* ASCII characters only in crossref */
+ compress = NO;
+ break;
+ case 'C': /* turn on caseless mode for symbol searches */
+ caseless = YES;
+ egrepcaseless(caseless); /* simulate egrep -i flag */
+ break;
+ case 'd': /* consider crossref up-to-date */
+ isuptodate = YES;
+ break;
+ case 'e': /* suppress ^E prompt between files */
+ editallprompt = NO;
+ break;
+ case 'k': /* ignore DFLT_INCDIR */
+ kernelmode = YES;
+ break;
+ case 'L':
+ onesearch = YES;
+ /* FALLTHROUGH */
+ case 'l':
+ linemode = YES;
+ break;
+ case 'v':
+ verbosemode = YES;
+ break;
+ case 'q': /* quick search */
+ invertedindex = YES;
+ break;
+ case 'T': /* truncate symbols to 8 characters */
+ trun_syms = YES;
+ break;
+ case 'u': /* unconditionally build the cross-reference */
+ unconditional = YES;
+ break;
+ case 'U': /* assume some files have changed */
+ fileschanged = YES;
+ break;
+ case 'R':
+ recurse_dir = YES;
+ break;
+ case 'f': /* alternate cross-reference file */
+ reffile = optarg;
+ if (strlen(reffile) > sizeof(path) - 3) {
+ postfatal("\
+ cscope: reffile too long, cannot \
+ be > %d characters\n", sizeof(path) - 3);
+ /* NOTREACHED */
+ }
+ strcpy(path, reffile);
+
+ s = path + strlen(path);
+ strcpy(s, ".in");
+ invname = my_strdup(path);
+ strcpy(s, ".po");
+ invpost = my_strdup(path);
+ break;
+
+ case 'F': /* symbol reference lines file */
+ reflines = optarg;
+ break;
+ case 'i': /* file containing file names */
+ namefile = optarg;
+ break;
+ case 'I': /* #include file directory */
+ includedir(optarg);
+ break;
+ case 'p': /* file path components to display */
+ dispcomponents = atoi(optarg);
+ break;
+ case 'P': /* prepend path to file names */
+ prependpath = optarg;
+ break;
+ case 's': /* additional source file directory */
+ sourcedir(optarg);
+ break;
+ }
+ }
+ /*
+ * This adjusts argv so that we only see the remaining
+ * args. Its ugly, but we need to do it so that the rest
+ * of the main routine doesn't get all confused
+ */
+ *argc = *argc - args_handled;
+ return &argv[*argc];
+ }
+ #endif
+
int
main(int argc, char **argv)
***************
*** 157,160 ****
--- 278,284 ----
/* set the options */
+ #ifdef _GNU_SOURCE
+ argv = parse_options(&argc, argv);
+ #else
while (--argc > 0 && (*++argv)[0] == '-') {
/* HBB 20030814: add GNU-style --help and --version options */
***************
*** 176,180 ****
for (s = argv[0] + 1; *s != '\0'; s++) {
!
/* look for an input field number */
if (isdigit((unsigned char) *s)) {
--- 300,314 ----
for (s = argv[0] + 1; *s != '\0'; s++) {
!
! if ((*s != 'f') && (*s != 'F') &&
! (*s != 'i') && (*s != 'I') &&
! (*s != 'p') && (*s != 'P') &&
! (*s != 's') && (*s != 'S')) {
! if (*(s+1) != '\0') {
! usage();
! myexit(1);
! }
! }
!
/* look for an input field number */
if (isdigit((unsigned char) *s)) {
***************
*** 326,329 ****
--- 460,464 ----
lastarg:
+ #endif
/* read the environment */
editor = mygetenv("EDITOR", EDITOR);
|
|
From: Neil Horman <nhorman@us...> - 2009-08-28 14:28:41
|
Update of /cvsroot/cscope/cscope/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25714/src
Modified Files:
crossref.c fscanner.l scanner.h
Log Message:
The lexer, if passed a file with a c extension that has only a '=' or ':' symbol
in it, will trigger lexer rules that expect my_yytext to be set. Since no other
rules have been triggered yet, my_yytext is NULL and a segfault occurs. To fix
this we add a LEXERR token and return it if my_yytext is null. This causes the
crossref generator to detect the lexer error and abort further processing of the
file.
Index: crossref.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/crossref.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** crossref.c 23 Jul 2006 20:59:20 -0000 1.14
--- crossref.c 28 Aug 2009 14:28:27 -0000 1.15
***************
*** 177,180 ****
--- 177,181 ----
break;
+ case LEXERR: /* Lexer error, abort further parsing of this file */
case LEXEOF: /* end of file; last line may not have \n */
Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** fscanner.l 7 Jan 2007 12:41:23 -0000 1.13
--- fscanner.l 28 Aug 2009 14:28:27 -0000 1.14
***************
*** 402,405 ****
--- 402,407 ----
}
= { /* if a global definition initializer */
+ if (!my_yytext)
+ return(LEXERR);
if (global == YES && ppdefine == NO && my_yytext[0] != '#') {
initializerbraces = braces;
***************
*** 410,413 ****
--- 412,417 ----
}
: { /* a if global structure field */
+ if (!my_yytext)
+ return(LEXERR);
if (global == YES && ppdefine == NO && my_yytext[0] != '#') {
structfield = YES;
Index: scanner.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/scanner.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** scanner.h 31 Jan 2005 16:50:33 -0000 1.4
--- scanner.h 28 Aug 2009 14:28:27 -0000 1.5
***************
*** 61,67 ****
/* other scanner token types */
! #define LEXEOF 0
! #define IDENT 1
! #define NEWLINE 2
/* scanner.l global data */
--- 61,68 ----
/* other scanner token types */
! #define LEXEOF 0
! #define LEXERR 1
! #define IDENT 2
! #define NEWLINE 3
/* scanner.l global data */
|
|
From: Neil Horman <nhorman@us...> - 2009-08-28 14:28:38
|
Update of /cvsroot/cscope/cscope In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25714 Modified Files: ChangeLog Log Message: The lexer, if passed a file with a c extension that has only a '=' or ':' symbol in it, will trigger lexer rules that expect my_yytext to be set. Since no other rules have been triggered yet, my_yytext is NULL and a segfault occurs. To fix this we add a LEXERR token and return it if my_yytext is null. This causes the crossref generator to detect the lexer error and abort further processing of the file. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.180 retrieving revision 1.181 diff -C2 -r1.180 -r1.181 *** ChangeLog 6 May 2009 14:41:50 -0000 1.180 --- ChangeLog 28 Aug 2009 14:28:27 -0000 1.181 *************** *** 1,2 **** --- 1,15 ---- + 2009-08-28 Neil Horman <nhorman@...> + + * src/scanner.h: Added a LEXERR token to be returned if a lexer error + occurs + + * src/crossref.c: Check for LEXERR token, and abort processing file if + lexer error occurs + + * src/fcanner.l: check the statue of my_yytext on = and : symbols. If + its NULL consider that a lexer error. This can occur if input files are + provided that contain only a '=' or ':' symbol. Without the ability to + detect and return a lexer error, we get a segfault. + 2009-05-06 Neil Horman <nhorman@...> |
|
From: Neil Horman <nhorman@us...> - 2009-05-06 14:42:13
|
Update of /cvsroot/cscope/cscope/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24449/src
Modified Files:
main.c
Log Message:
Fixing length check on alt. ref file
Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** main.c 10 Apr 2009 13:39:23 -0000 1.46
--- main.c 6 May 2009 14:41:51 -0000 1.47
***************
*** 266,272 ****
case 'f': /* alternate cross-reference file */
reffile = s;
! if (strlen(reffile) > sizeof(path) - 1) {
postfatal("\
! cscope: reffile too long, cannot be > %d characters\n", sizeof(path) - 1);
/* NOTREACHED */
}
--- 266,272 ----
case 'f': /* alternate cross-reference file */
reffile = s;
! if (strlen(reffile) > sizeof(path) - 3) {
postfatal("\
! cscope: reffile too long, cannot be > %d characters\n", sizeof(path) - 3);
/* NOTREACHED */
}
|
|
From: Neil Horman <nhorman@us...> - 2009-05-06 14:42:05
|
Update of /cvsroot/cscope/cscope In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24449 Modified Files: ChangeLog Log Message: Fixing length check on alt. ref file Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.179 retrieving revision 1.180 diff -C2 -r1.179 -r1.180 *** ChangeLog 30 Apr 2009 22:16:28 -0000 1.179 --- ChangeLog 6 May 2009 14:41:50 -0000 1.180 *************** *** 1,2 **** --- 1,6 ---- + 2009-05-06 Neil Horman <nhorman@...> + + * src/main.c: Fixed string length checks to avoid overflow + 2009-04-30 Hans-Bernhard Broeker <broeker@...> |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2009-04-30 22:16:46
|
Update of /cvsroot/cscope/cscope/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19260/src Modified Files: version.h Log Message: Version number to 15.7a Index: version.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/version.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** version.h 5 Jul 2001 14:31:00 -0000 1.8 --- version.h 30 Apr 2009 22:16:28 -0000 1.9 *************** *** 42,47 **** #define CSCOPE_VERSION_H ! #define FILEVERSION 16 /* Initial Open Source and Linux Port */ ! #define FIXVERSION ".0a" /* feature and bug fix version */ #endif /* CSCOPE_VERSION_H */ --- 42,47 ---- #define CSCOPE_VERSION_H ! #define FILEVERSION 15 /* Initial Open Source and Linux Port */ ! #define FIXVERSION ".7a" /* feature and bug fix version */ #endif /* CSCOPE_VERSION_H */ |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2009-04-30 22:16:41
|
Update of /cvsroot/cscope/cscope In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19260 Modified Files: ChangeLog configure configure.in Log Message: Version number to 15.7a Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.178 retrieving revision 1.179 diff -C2 -r1.178 -r1.179 *** ChangeLog 10 Apr 2009 13:39:22 -0000 1.178 --- ChangeLog 30 Apr 2009 22:16:28 -0000 1.179 *************** *** 1,2 **** --- 1,11 ---- + 2009-04-30 Hans-Bernhard Broeker <broeker@...> + + * src/version.h (FILEVERSION, FIXVERSION): Version number changed + to 15.7a. + + * configure.in: Version number changed to 15.7a. + + * configure (all): Regenerated. + 2009-04-10 Hans-Bernhard Broeker <broeker@...> Index: configure =================================================================== RCS file: /cvsroot/cscope/cscope/configure,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** configure 10 Apr 2009 13:39:22 -0000 1.31 --- configure 30 Apr 2009 22:16:28 -0000 1.32 *************** *** 2079,2083 **** # Define the identity of the package. PACKAGE=cscope ! VERSION=16.0a --- 2079,2083 ---- # Define the identity of the package. PACKAGE=cscope ! VERSION=15.7a Index: configure.in =================================================================== RCS file: /cvsroot/cscope/cscope/configure.in,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** configure.in 10 Apr 2009 13:39:23 -0000 1.35 --- configure.in 30 Apr 2009 22:16:28 -0000 1.36 *************** *** 2,6 **** AC_INIT AC_CONFIG_SRCDIR([src/crossref.c]) ! AM_INIT_AUTOMAKE(cscope, 16.0a) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_PREREQ(2.59) --- 2,6 ---- AC_INIT AC_CONFIG_SRCDIR([src/crossref.c]) ! AM_INIT_AUTOMAKE(cscope, 15.7a) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_PREREQ(2.59) |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2009-04-10 14:16:48
|
Update of /cvsroot/cscope/cscope/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099/src Modified Files: build.c command.c dir.c display.c edit.c exec.c find.c global.h main.c Makefile.am Makefile.in vpaccess.c vpfopen.c vpopen.c Added Files: snprintf.c Log Message: Replace all usage of (v)sprintf by (v)snprintf. Supply and use optional replacement snprintf on systems that don't have it. --- NEW FILE --- /* $Id: snprintf.c,v 1.1 2009/04/10 13:39:23 broeker Exp $ */ /* * Copyright (c) 1995 Patrick Powell. * * This code is based on code written by Patrick Powell <papowell@...>. * It may be used for any purpose as long as this notice remains intact on all * source code distributions. */ /* * Copyright (c) 2008 Holger Weiss. * * This version of the code is maintained by Holger Weiss <holger@...>. * My changes to the code may freely be used, modified and/or redistributed for * any purpose. It would be nice if additions and fixes to this file (including * trivial code cleanups) would be sent back in order to let me include them in * the version available at <http://www.jhweiss.de/software/snprintf.html>;. * However, this is not a requirement for using or redistributing (possibly [...2058 lines suppressed...] #if !OS_SYSV /* SysV uses a different format than we do. */ TEST(pointer_fmt, pointer_val); #endif /* !OS_SYSV */ (void)printf("Result: %d out of %d tests failed.\n", failed, num); (void)fputs("Checking how many digits we support: ", stdout); for (i = 0; i < 100; i++) { value = pow(10, i) * digits; (void)sprintf(buf1, "%.1f", value); (void)snprintf(buf2, sizeof(buf2), "%.1f", value); if (strcmp(buf1, buf2) != 0) { (void)printf("apparently %d.\n", i); break; } } return (failed == 0) ? 0 : 1; } #endif /* TEST_SNPRINTF */ /* vim: set joinspaces textwidth=80: */ Index: build.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/build.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** build.c 12 Mar 2008 22:40:47 -0000 1.14 --- build.c 10 Apr 2009 13:39:23 -0000 1.15 *************** *** 224,228 **** strcpy(newdir, "$HOME"); } else if (strncmp(currentdir, home, strlen(home)) == 0) { ! sprintf(newdir, "$HOME%s", currentdir + strlen(home)); } /* sort the source file names (needed for rebuilding) */ --- 224,228 ---- strcpy(newdir, "$HOME"); } else if (strncmp(currentdir, home, strlen(home)) == 0) { ! snprintf(newdir, sizeof(newdir), "$HOME%s", currentdir + strlen(home)); } /* sort the source file names (needed for rebuilding) */ *************** *** 457,461 **** fstat(fileno(postings), &statstruct); fclose(postings); ! sprintf(sortcommand, "env LC_ALL=C sort -T %s %s", tmpdir, temp1); if ((postings = mypopen(sortcommand, "r")) == NULL) { fprintf(stderr, "cscope: cannot open pipe to sort command\n"); --- 457,461 ---- fstat(fileno(postings), &statstruct); fclose(postings); ! snprintf(sortcommand, sizeof(sortcommand), "env LC_ALL=C sort -T %s %s", tmpdir, temp1); if ((postings = mypopen(sortcommand, "r")) == NULL) { fprintf(stderr, "cscope: cannot open pipe to sort command\n"); Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** command.c 20 Aug 2006 15:00:33 -0000 1.32 --- command.c 10 Apr 2009 13:39:23 -0000 1.33 *************** *** 740,744 **** /* make sure it can be changed */ if (access(newfile, WRITE) != 0) { ! sprintf(msg, "Cannot write to file %s", newfile); postmsg(msg); anymarked = NO; --- 740,744 ---- /* make sure it can be changed */ if (access(newfile, WRITE) != 0) { ! snprintf(msg, sizeof(msg), "Cannot write to file %s", newfile); postmsg(msg); anymarked = NO; Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** dir.c 14 Feb 2008 12:39:37 -0000 1.30 --- dir.c 10 Apr 2009 13:39:23 -0000 1.31 *************** *** 141,145 **** /* compute its path from higher view path source dirs */ for (i = 1; i < nvpsrcdirs; ++i) { ! sprintf(path, "%.*s/%s", PATHLEN - 2 - dir_len, srcdirs[i], dir); --- 141,145 ---- /* compute its path from higher view path source dirs */ for (i = 1; i < nvpsrcdirs; ++i) { ! snprintf(path, sizeof(path), "%.*s/%s", PATHLEN - 2 - dir_len, srcdirs[i], dir); *************** *** 209,213 **** /* compute its path from higher view path source dirs */ for (i = 1; i < nvpsrcdirs; ++i) { ! sprintf(path, "%.*s/%s", PATHLEN - 2 - dir_len, srcdirs[i], dir); --- 209,213 ---- /* compute its path from higher view path source dirs */ for (i = 1; i < nvpsrcdirs; ++i) { ! snprintf(path, sizeof(path), "%.*s/%s", PATHLEN - 2 - dir_len, srcdirs[i], dir); *************** *** 496,500 **** struct stat buf; ! sprintf(path,"%s/%.*s", adir, PATHLEN - 2 - adir_len, entry->d_name); --- 496,500 ---- struct stat buf; ! snprintf(path, sizeof(path), "%s/%.*s", adir, PATHLEN - 2 - adir_len, entry->d_name); *************** *** 608,612 **** for (i = 0; i < nincdirs; ++i) { /* don't include the file from two directories */ ! sprintf(name, "%.*s/%s", PATHLEN - 2 - file_len, incnames[i], file); --- 608,612 ---- for (i = 0; i < nincdirs; ++i) { /* don't include the file from two directories */ ! snprintf(name, sizeof(name), "%.*s/%s", PATHLEN - 2 - file_len, incnames[i], file); *************** *** 615,619 **** } /* make sure it exists and is readable */ ! sprintf(path, "%.*s/%s", PATHLEN - 2 - file_len, incdirs[i], file); --- 615,619 ---- } /* make sure it exists and is readable */ ! snprintf(path, sizeof(path), "%.*s/%s", PATHLEN - 2 - file_len, incdirs[i], file); *************** *** 679,683 **** /* compute its path from higher view path source dirs */ for (i = 1; i < nvpsrcdirs; ++i) { ! sprintf(path, "%.*s/%s", PATHLEN - 2 - file_len, srcdirs[i], file); --- 679,683 ---- /* compute its path from higher view path source dirs */ for (i = 1; i < nvpsrcdirs; ++i) { ! snprintf(path, sizeof(path), "%.*s/%s", PATHLEN - 2 - file_len, srcdirs[i], file); Index: display.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/display.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** display.c 20 Aug 2006 15:00:34 -0000 1.29 --- display.c 10 Apr 2009 13:39:23 -0000 1.30 *************** *** 479,496 **** if ((c = getc(refsfound)) == EOF) { 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); } --- 479,496 ---- if ((c = getc(refsfound)) == EOF) { if (findresult != NULL) { ! (void) snprintf(lastmsg, sizeof(lastmsg), "Egrep %s in this pattern: %s", findresult, Pattern); } else if (rc == NOTSYMBOL) { ! (void) snprintf(lastmsg, sizeof(lastmsg), "This is not a C symbol: %s", Pattern); } else if (rc == REGCMPERROR) { ! (void) snprintf(lastmsg, sizeof(lastmsg), "Error in this regcomp(3) regular expression: %s", Pattern); } else if (funcexist == NO) { ! (void) snprintf(lastmsg, sizeof(lastmsg), "Function definition does not exist: %s", Pattern); } else { ! (void) snprintf(lastmsg, sizeof(lastmsg), "Could not find the %s: %s", fields[field].text2, Pattern); } *************** *** 528,535 **** clrtoeol(); addstr(what); ! sprintf(msg, "%ld", current); move(MSGLINE, (COLS / 2) - (strlen(msg) / 2)); addstr(msg); ! sprintf(msg, "%ld", max); move(MSGLINE, COLS - strlen(msg)); addstr(msg); --- 528,535 ---- clrtoeol(); addstr(what); ! snprintf(msg, sizeof(msg), "%ld", current); move(MSGLINE, (COLS / 2) - (strlen(msg) / 2)); addstr(msg); ! snprintf(msg, sizeof(msg), "%ld", max); move(MSGLINE, COLS - strlen(msg)); addstr(msg); *************** *** 538,542 **** else if (verbosemode == YES) { ! sprintf(msg, "> %s %ld of %ld", what, current, max); } --- 538,542 ---- else if (verbosemode == YES) { ! snprintf(msg, sizeof(msg), "> %s %ld of %ld", what, current, max); } *************** *** 576,580 **** } #endif ! (void) sprintf(msg, "%s: %s", text, s); postmsg(msg); } --- 576,580 ---- } #endif ! (void) snprintf(msg, sizeof(msg), "%s: %s", text, s); postmsg(msg); } *************** *** 648,656 **** (void) fputc('\n', stderr); } else { - #if HAVE_VSNPRINTF vsnprintf(errbuf, sizeof(errbuf), msg, ap); - #else - vsprintf(errbuf, msg, ap); - #endif postmsg2(errbuf); } --- 648,652 ---- *************** *** 665,673 **** va_start(ap, msg); - #if HAVE_VSNPRINTF vsnprintf(errbuf, sizeof(errbuf), msg, ap); - #else - vsprintf(errbuf, msg, ap); - #endif /* restore the terminal to its original mode */ if (incurses == YES) { --- 661,665 ---- Index: edit.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/edit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** edit.c 20 Aug 2006 15:00:34 -0000 1.6 --- edit.c 10 Apr 2009 13:39:23 -0000 1.7 *************** *** 106,112 **** file = filepath(file); ! (void) sprintf(msg, "%s +%s %s", mybasename(editor), linenum, file); postmsg(msg); ! (void) sprintf(plusnum, lineflag, linenum); /* if this is the more or page commands */ if (strcmp(s = mybasename(editor), "more") == 0 || strcmp(s, "page") == 0) { --- 106,112 ---- file = filepath(file); ! (void) snprintf(msg, sizeof(msg), "%s +%s %s", mybasename(editor), linenum, file); postmsg(msg); ! (void) snprintf(plusnum, sizeof(plusnum), lineflag, linenum); /* if this is the more or page commands */ if (strcmp(s = mybasename(editor), "more") == 0 || strcmp(s, "page") == 0) { *************** *** 133,137 **** if (prependpath != NULL && *file != '/') { ! (void) sprintf(path, "%s/%s", prependpath, file); file = path; } --- 133,137 ---- if (prependpath != NULL && *file != '/') { ! (void) snprintf(path, sizeof(path), "%s/%s", prependpath, file); file = path; } Index: exec.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/exec.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** exec.c 11 Apr 2008 11:23:55 -0000 1.11 --- exec.c 10 Apr 2009 13:39:23 -0000 1.12 *************** *** 124,128 **** /* execute the program or shell script */ execvp(a, args); /* returns only on failure */ ! sprintf(msg, "\nCannot exec %s", a); perror(msg); /* display the reason */ askforreturn(); /* wait until the user sees the message */ --- 124,128 ---- /* execute the program or shell script */ execvp(a, args); /* returns only on failure */ ! snprintf(msg, sizeof(msg), "\nCannot exec %s", a); perror(msg); /* display the reason */ askforreturn(); /* wait until the user sees the message */ Index: find.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/find.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** find.c 20 Aug 2006 19:15:54 -0000 1.20 --- find.c 10 Apr 2009 13:39:23 -0000 1.21 *************** *** 674,678 **** /* note: regcomp doesn't recognize ^*keypad$ as a syntax error unless it is given as a single arg */ ! (void) sprintf(buf, "^%s$", s); if (regcomp (®exp, buf, REG_EXTENDED | REG_NOSUB) != 0) { return(REGCMPERROR); --- 674,678 ---- /* note: regcomp doesn't recognize ^*keypad$ as a syntax error unless it is given as a single arg */ ! (void) snprintf(buf, sizeof(buf), "^%s$", s); if (regcomp (®exp, buf, REG_EXTENDED | REG_NOSUB) != 0) { return(REGCMPERROR); Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** global.h 30 Jun 2008 21:16:02 -0000 1.36 --- global.h 10 Apr 2009 13:39:23 -0000 1.37 *************** *** 95,98 **** --- 95,114 ---- #endif + #if HAVE_STDARG_H + #include <stdarg.h> + #if !HAVE_VSNPRINTF + int rpl_vsnprintf(char *, size_t, const char *, va_list); + #endif + #if !HAVE_SNPRINTF + int rpl_snprintf(char *, size_t, const char *, ...); + #endif + #if !HAVE_VASPRINTF + int rpl_vasprintf(char **, const char *, va_list); + #endif + #if !HAVE_ASPRINTF + int rpl_asprintf(char **, const char *, ...); + #endif + #endif /* HAVE_STDARG_H */ + /* FIXME: this testing for platforms is foolish. Stop it! */ #if BSD Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** main.c 11 Apr 2008 11:23:55 -0000 1.45 --- main.c 10 Apr 2009 13:39:23 -0000 1.46 *************** *** 356,360 **** orig_umask = umask(S_IRWXG|S_IRWXO); pid = getpid(); ! sprintf(tempdirpv, "%s/cscope.%d", tmpdir, pid); if(mkdir(tempdirpv,S_IRWXU)) { fprintf(stderr, "\ --- 356,360 ---- orig_umask = umask(S_IRWXG|S_IRWXO); pid = getpid(); ! snprintf(tempdirpv, sizeof(tempdirpv), "%s/cscope.%d", tmpdir, pid); if(mkdir(tempdirpv,S_IRWXU)) { fprintf(stderr, "\ *************** *** 365,370 **** umask(orig_umask); ! sprintf(temp1, "%s/cscope.1", tempdirpv); ! sprintf(temp2, "%s/cscope.2", tempdirpv); /* if running in the foreground */ --- 365,370 ---- umask(orig_umask); ! snprintf(temp1, sizeof(temp1), "%s/cscope.1", tempdirpv); ! snprintf(temp2, sizeof(temp2), "%s/cscope.2", tempdirpv); /* if running in the foreground */ *************** *** 389,398 **** * the home directory */ ! sprintf(path, "%s/%s", home, reffile); if (isuptodate == NO || access(path, READ) == 0) { reffile = my_strdup(path); ! sprintf(path, "%s/%s", home, invname); invname = my_strdup(path); ! sprintf(path, "%s/%s", home, invpost); invpost = my_strdup(path); } --- 389,398 ---- * the home directory */ ! snprintf(path, sizeof(path), "%s/%s", home, reffile); if (isuptodate == NO || access(path, READ) == 0) { reffile = my_strdup(path); ! snprintf(path, sizeof(path), "%s/%s", home, invname); invname = my_strdup(path); ! snprintf(path, sizeof(path), "%s/%s", home, invpost); invpost = my_strdup(path); } *************** *** 735,754 **** cannotwrite(char *file) { - #if HAVE_SNPRINTF char msg[MSGLEN + 1]; snprintf(msg, sizeof(msg), "Removed file %s because write failed", file); - #else - char *msg = mymalloc(50 + strlen(file)); - - sprintf(msg, "Removed file %s because write failed", file); - #endif myperror(msg); /* display the reason */ - #if !HAVE_SNPRINTF - free(msg); - #endif - unlink(file); myexit(1); /* calls exit(2), which closes files */ --- 735,744 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** Makefile.am 30 Sep 2006 20:29:14 -0000 1.12 --- Makefile.am 10 Apr 2009 13:39:23 -0000 1.13 *************** *** 30,34 **** LEXLIB = @LEXLIB@ ! cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) --- 30,34 ---- LEXLIB = @LEXLIB@ ! cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) $(LIBOBJS) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** Makefile.in 30 Jun 2008 21:36:48 -0000 1.15 --- Makefile.in 10 Apr 2009 13:39:23 -0000 1.16 *************** *** 42,48 **** subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in egrep.c \ ! fscanner.c scanner.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 42,49 ---- subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in egrep.c \ ! fscanner.c scanner.c snprintf.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ! $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 73,77 **** cscope_OBJECTS = $(am_cscope_OBJECTS) am__DEPENDENCIES_1 = ! cscope_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__gscope_SOURCES_DIST = gscope.c fscanner.l scanner.l egrep.y \ alloc.c alloc.h basename.c build.c build.h command.c compath.c \ --- 74,80 ---- cscope_OBJECTS = $(am_cscope_OBJECTS) am__DEPENDENCIES_1 = ! am__DEPENDENCIES_2 = @LIBOBJS@ ! cscope_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ! $(am__DEPENDENCIES_2) am__gscope_SOURCES_DIST = gscope.c fscanner.l scanner.l egrep.y \ alloc.c alloc.h basename.c build.c build.h command.c compath.c \ *************** *** 236,240 **** EXTRA_cscope_SOURCES = scanner.l fscanner.l ! cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) CLEANFILES = scanner.c fscanner.c egrep.c --- 239,243 ---- EXTRA_cscope_SOURCES = scanner.l fscanner.l ! cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) $(LIBOBJS) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) CLEANFILES = scanner.c fscanner.c egrep.c *************** *** 317,320 **** --- 320,324 ---- -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@...@ @AMDEP_TRUE@@am__include@ @am__quote@.../$(DEPDIR)/alloc.Po@...@ @AMDEP_TRUE@@am__include@ @am__quote@.../$(DEPDIR)/basename.Po@...@ *************** *** 917,921 **** distclean: distclean-am ! -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ --- 921,925 ---- distclean: distclean-am ! -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ *************** *** 943,947 **** maintainer-clean: maintainer-clean-am ! -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 947,951 ---- maintainer-clean: maintainer-clean-am ! -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic Index: vpaccess.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/vpaccess.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** vpaccess.c 3 May 2000 22:02:10 -0000 1.2 --- vpaccess.c 10 Apr 2009 13:39:23 -0000 1.3 *************** *** 50,54 **** vpinit(NULL); for (i = 1; i < vpndirs; i++) { ! (void) sprintf(buf, "%s/%s", vpdirs[i], path); if ((returncode = access(buf, amode)) != -1) { break; --- 50,54 ---- vpinit(NULL); for (i = 1; i < vpndirs; i++) { ! (void) snprintf(buf, sizeof(buf), "%s/%s", vpdirs[i], path); if ((returncode = access(buf, amode)) != -1) { break; Index: vpfopen.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/vpfopen.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** vpfopen.c 27 Mar 2001 14:09:19 -0000 1.3 --- vpfopen.c 10 Apr 2009 13:39:23 -0000 1.4 *************** *** 54,58 **** vpinit(NULL); for (i = 1; i < vpndirs; i++) { ! (void) sprintf(buf, "%s/%s", vpdirs[i], filename); if ((returncode = myfopen(buf, type)) != NULL) { break; --- 54,58 ---- vpinit(NULL); for (i = 1; i < vpndirs; i++) { ! (void) snprintf(buf, sizeof(buf), "%s/%s", vpdirs[i], filename); if ((returncode = myfopen(buf, type)) != NULL) { break; Index: vpopen.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/vpopen.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** vpopen.c 28 Jul 2002 15:40:07 -0000 1.4 --- vpopen.c 10 Apr 2009 13:39:23 -0000 1.5 *************** *** 53,57 **** vpinit(NULL); for (i = 1; i < vpndirs; i++) { ! (void) sprintf(buf, "%s/%s", vpdirs[i], path); if ((returncode = myopen(buf, oflag, 0666)) != -1) { break; --- 53,57 ---- vpinit(NULL); for (i = 1; i < vpndirs; i++) { ! (void) snprintf(buf, sizeof(buf), "%s/%s", vpdirs[i], path); if ((returncode = myopen(buf, oflag, 0666)) != -1) { break; |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2009-04-10 14:16:47
|
Update of /cvsroot/cscope/cscope In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099 Modified Files: aclocal.m4 ChangeLog config.h.in configure configure.in Makefile.in Added Files: acinclude.m4 Log Message: Replace all usage of (v)sprintf by (v)snprintf. Supply and use optional replacement snprintf on systems that don't have it. --- NEW FILE --- # $Id: acinclude.m4,v 1.1 2009/04/10 13:39:22 broeker Exp $ # Copyright (c) 2008 Holger Weiss <holger@...>. # # This code may freely be used, modified and/or redistributed for any purpose. # It would be nice if additions and fixes to this file (including trivial code # cleanups) would be sent back in order to let me include them in the version # available at <http://www.jhweiss.de/software/snprintf.html>;. However, this is # not a requirement for using or redistributing (possibly modified) versions of # this file, nor is leaving this notice intact mandatory. # HW_HEADER_STDARG_H # ------------------ # Define HAVE_STDARG_H to 1 if <stdarg.h> is available. AC_DEFUN([HW_HEADER_STDARG_H], [ AC_PREREQ([2.60])dnl Older releases should work if AC_CHECK_HEADERS is used. AC_CHECK_HEADERS_ONCE([stdarg.h]) ])# HW_HEADER_STDARG_H # HW_HEADER_VARARGS_H # ------------------- # Define HAVE_VARARGS_H to 1 if <varargs.h> is available. AC_DEFUN([HW_HEADER_VARARGS_H], [ AC_PREREQ([2.60])dnl Older releases should work if AC_CHECK_HEADERS is used. AC_CHECK_HEADERS_ONCE([varargs.h]) ])# HW_HEADER_VARARGS_H # HW_FUNC_VA_COPY # --------------- # Set $hw_cv_func_va_copy to "yes" or "no". Define HAVE_VA_COPY to 1 if # $hw_cv_func_va_copy is set to "yes". Note that it's "unspecified whether # va_copy and va_end are macros or identifiers declared with external linkage." # (C99: 7.15.1, 1) Therefore, the presence of va_copy(3) cannot simply "be # tested with #ifdef", as suggested by the Autoconf manual (5.5.1). AC_DEFUN([HW_FUNC_VA_COPY], [ AC_REQUIRE([HW_HEADER_STDARG_H])dnl Our check evaluates HAVE_STDARG_H. AC_REQUIRE([HW_HEADER_VARARGS_H])dnl Our check evaluates HAVE_VARARGS_H. AC_CACHE_CHECK([for va_copy], [hw_cv_func_va_copy], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#if HAVE_STDARG_H #include <stdarg.h> #elif HAVE_VARARGS_H #include <varargs.h> #endif]], [[va_list ap, aq; va_copy(aq, ap);]])], [hw_cv_func_va_copy=yes], [hw_cv_func_va_copy=no], [hw_cv_func_va_copy=no])]) AS_IF([test "$hw_cv_func_va_copy" = yes], [AC_DEFINE([HAVE_VA_COPY], [1], [Define to 1 if you have the `va_copy' function or macro.])]) ])# HW_FUNC_VA_COPY # HW_FUNC___VA_COPY # ----------------- # Set $hw_cv_func___va_copy to "yes" or "no". Define HAVE___VA_COPY to 1 if # $hw_cv_func___va_copy is set to "yes". AC_DEFUN([HW_FUNC___VA_COPY], [ AC_REQUIRE([HW_HEADER_STDARG_H])dnl Our check evaluates HAVE_STDARG_H. AC_REQUIRE([HW_HEADER_VARARGS_H])dnl Our check evaluates HAVE_VARARGS_H. AC_CACHE_CHECK([for __va_copy], [hw_cv_func___va_copy], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#if HAVE_STDARG_H #include <stdarg.h> #elif HAVE_VARARGS_H #include <varargs.h> #endif]], [[va_list ap, aq; __va_copy(aq, ap);]])], [hw_cv_func___va_copy=yes], [hw_cv_func___va_copy=no], [hw_cv_func___va_copy=no])]) AS_IF([test "$hw_cv_func___va_copy" = yes], [AC_DEFINE([HAVE___VA_COPY], [1], [Define to 1 if you have the `__va_copy' function or macro.])]) ])# HW_FUNC___VA_COPY # HW_FUNC_VSNPRINTF # ----------------- # Set $hw_cv_func_vsnprintf and $hw_cv_func_vsnprintf_c99 to "yes" or "no", # respectively. Define HAVE_VSNPRINTF to 1 only if $hw_cv_func_vsnprintf_c99 # is set to "yes". Otherwise, define vsnprintf to rpl_vsnprintf and make sure # the replacement function will be built. AC_DEFUN([HW_FUNC_VSNPRINTF], [ AC_PREREQ([2.60])dnl 2.59 should work if some AC_TYPE_* macros are replaced. AC_REQUIRE([HW_HEADER_STDARG_H])dnl Our check evaluates HAVE_STDARG_H. AC_CHECK_FUNC([vsnprintf], [hw_cv_func_vsnprintf=yes], [hw_cv_func_vsnprintf=no]) AS_IF([test "$hw_cv_func_vsnprintf" = yes], [AC_CACHE_CHECK([whether vsnprintf is C99 compliant], [hw_cv_func_vsnprintf_c99], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#if HAVE_STDARG_H #include <stdarg.h> #endif #include <stdio.h> static int testprintf(char *buf, size_t size, const char *format, ...) { int result; va_list ap; va_start(ap, format); result = vsnprintf(buf, size, format, ap); va_end(ap); return result; }]], [[char buf[43]; if (testprintf(buf, 4, "The answer is %27.2g.", 42.0) != 42 || testprintf(buf, 0, "No, it's %32zu.", (size_t)42) != 42 || buf[0] != 'T' || buf[3] != '\0') return 1;]])], [hw_cv_func_vsnprintf_c99=yes], [hw_cv_func_vsnprintf_c99=no], [hw_cv_func_vsnprintf_c99=no])])], [hw_cv_func_snprintf_c99=no]) AS_IF([test "$hw_cv_func_vsnprintf_c99" = yes], [AC_DEFINE([HAVE_VSNPRINTF], [1], [Define to 1 if you have a C99 compliant `vsnprintf' function.])], [AC_DEFINE([vsnprintf], [rpl_vsnprintf], [Define to rpl_vsnprintf if the replacement function should be used.]) AC_CHECK_HEADERS([inttypes.h locale.h stddef.h stdint.h]) AC_CHECK_MEMBERS([struct lconv.decimal_point, struct lconv.thousands_sep], [], [], [#include <locale.h>]) AC_TYPE_LONG_DOUBLE AC_TYPE_LONG_LONG_INT AC_TYPE_UNSIGNED_LONG_LONG_INT AC_TYPE_SIZE_T AC_TYPE_INTMAX_T AC_TYPE_UINTMAX_T AC_TYPE_UINTPTR_T AC_CHECK_TYPES([ptrdiff_t]) AC_CHECK_FUNCS([localeconv]) _HW_FUNC_XPRINTF_REPLACE]) ])# HW_FUNC_VSNPRINTF # HW_FUNC_SNPRINTF # ---------------- # Set $hw_cv_func_snprintf and $hw_cv_func_snprintf_c99 to "yes" or "no", # respectively. Define HAVE_SNPRINTF to 1 only if $hw_cv_func_snprintf_c99 # is set to "yes". Otherwise, define snprintf to rpl_snprintf and make sure # the replacement function will be built. AC_DEFUN([HW_FUNC_SNPRINTF], [ AC_REQUIRE([HW_FUNC_VSNPRINTF])dnl Our snprintf(3) calls vsnprintf(3). AC_CHECK_FUNC([snprintf], [hw_cv_func_snprintf=yes], [hw_cv_func_snprintf=no]) AS_IF([test "$hw_cv_func_snprintf" = yes], [AC_CACHE_CHECK([whether snprintf is C99 compliant], [hw_cv_func_snprintf_c99], [AC_RUN_IFELSE( [AC_LANG_PROGRAM([[#include <stdio.h>]], [[char buf[43]; if (snprintf(buf, 4, "The answer is %27.2g.", 42.0) != 42 || snprintf(buf, 0, "No, it's %32zu.", (size_t)42) != 42 || buf[0] != 'T' || buf[3] != '\0') return 1;]])], [hw_cv_func_snprintf_c99=yes], [hw_cv_func_snprintf_c99=no], [hw_cv_func_snprintf_c99=no])])], [hw_cv_func_snprintf_c99=no]) AS_IF([test "$hw_cv_func_snprintf_c99" = yes], [AC_DEFINE([HAVE_SNPRINTF], [1], [Define to 1 if you have a C99 compliant `snprintf' function.])], [AC_DEFINE([snprintf], [rpl_snprintf], [Define to rpl_snprintf if the replacement function should be used.]) _HW_FUNC_XPRINTF_REPLACE]) ])# HW_FUNC_SNPRINTF # HW_FUNC_VASPRINTF # ----------------- # Set $hw_cv_func_vasprintf to "yes" or "no". Define HAVE_VASPRINTF to 1 if # $hw_cv_func_vasprintf is set to "yes". Otherwise, define vasprintf to # rpl_vasprintf and make sure the replacement function will be built. AC_DEFUN([HW_FUNC_VASPRINTF], [ AC_REQUIRE([HW_FUNC_VSNPRINTF])dnl Our vasprintf(3) calls vsnprintf(3). AC_CHECK_FUNCS([vasprintf], [hw_cv_func_vasprintf=yes], [hw_cv_func_vasprintf=no]) AS_IF([test "$hw_cv_func_vasprintf" = no], [AC_DEFINE([vasprintf], [rpl_vasprintf], [Define to rpl_vasprintf if the replacement function should be used.]) AC_CHECK_HEADERS([stdlib.h]) HW_FUNC_VA_COPY AS_IF([test "$hw_cv_func_va_copy" = no], [HW_FUNC___VA_COPY]) _HW_FUNC_XPRINTF_REPLACE]) ])# HW_FUNC_VASPRINTF # HW_FUNC_ASPRINTF # ---------------- # Set $hw_cv_func_asprintf to "yes" or "no". Define HAVE_ASPRINTF to 1 if # $hw_cv_func_asprintf is set to "yes". Otherwise, define asprintf to # rpl_asprintf and make sure the replacement function will be built. AC_DEFUN([HW_FUNC_ASPRINTF], [ AC_REQUIRE([HW_FUNC_VASPRINTF])dnl Our asprintf(3) calls vasprintf(3). AC_CHECK_FUNCS([asprintf], [hw_cv_func_asprintf=yes], [hw_cv_func_asprintf=no]) AS_IF([test "$hw_cv_func_asprintf" = no], [AC_DEFINE([asprintf], [rpl_asprintf], [Define to rpl_asprintf if the replacement function should be used.]) _HW_FUNC_XPRINTF_REPLACE]) ])# HW_FUNC_ASPRINTF # _HW_FUNC_XPRINTF_REPLACE # ------------------------ # Arrange for building snprintf.c. Must be called if one or more of the # functions provided by snprintf.c are needed. AC_DEFUN([_HW_FUNC_XPRINTF_REPLACE], [ AS_IF([test "x$_hw_cv_func_xprintf_replace_done" != xyes], [AC_C_CONST HW_HEADER_STDARG_H AC_LIBOBJ([snprintf]) _hw_cv_func_xprintf_replace_done=yes]) ])# _HW_FUNC_XPRINTF_REPLACE dnl vim: set joinspaces textwidth=80: Index: aclocal.m4 =================================================================== RCS file: /cvsroot/cscope/cscope/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** aclocal.m4 30 Sep 2006 17:31:14 -0000 1.8 --- aclocal.m4 10 Apr 2009 13:39:22 -0000 1.9 *************** *** 870,871 **** --- 870,872 ---- ]) # _AM_PROG_TAR + m4_include([acinclude.m4]) Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.177 retrieving revision 1.178 diff -C2 -r1.177 -r1.178 *** ChangeLog 30 Jun 2008 21:36:48 -0000 1.177 --- ChangeLog 10 Apr 2009 13:39:22 -0000 1.178 *************** *** 1,2 **** --- 1,27 ---- + 2009-04-10 Hans-Bernhard Broeker <broeker@...> + + * src/snprintf.c: Replacement implementation for missing snprintf + and vsprintf, from http://www.jhweiss.de. + + * acinclude: New macros to optionally activate a replacement for + missing snprintf and vsprintf, from http://www.jhweiss.de. + + * configure.in: Call new macros for snprintf and vsprintf. Drop + AC_FUNC_LSTAT in turn, since it would have required a replacement + implementation for lstat(). + + * src/Makefile.am (cscope_LDADD): Added LIBOBJS to automatically + include snprintf.o in the build if and only if needed. + + * configure, config.h.in, aclocal.m4, Makefile.in, + contrib/Makefile.in, doc/Makefile.in, src/Makefile.in: + Regenerated. + + * src/global.h: Add prototypes for replacement snprintf and + vsnprintf. + + * src/*.c: Replace all calls of sprintf by snprintf to avoid + possible buffer overflows. + 2008-06-30 Hans-Bernhard Broeker <broeker@...> Index: config.h.in =================================================================== RCS file: /cvsroot/cscope/cscope/config.h.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** config.h.in 30 Jun 2008 21:36:48 -0000 1.19 --- config.h.in 10 Apr 2009 13:39:22 -0000 1.20 *************** *** 7,10 **** --- 7,13 ---- #undef HAS_CURSES + /* Define to 1 if you have the `asprintf' function. */ + #undef HAVE_ASPRINTF + /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ *************** *** 23,26 **** --- 26,32 ---- #undef HAVE_GETCWD + /* Define to 1 if the system has the type `intmax_t'. */ + #undef HAVE_INTMAX_T + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H *************** *** 32,42 **** #undef HAVE_LIBREGEX /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT - /* Define to 1 if `lstat' has the bug that it succeeds when given the - zero-length file name argument. */ - #undef HAVE_LSTAT_EMPTY_STRING_BUG - /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY --- 38,56 ---- #undef HAVE_LIBREGEX + /* Define to 1 if you have the `localeconv' function. */ + #undef HAVE_LOCALECONV + + /* Define to 1 if you have the <locale.h> header file. */ + #undef HAVE_LOCALE_H + + /* Define to 1 if the system has the type `long double'. */ + #undef HAVE_LONG_DOUBLE + + /* Define to 1 if the system has the type `long long int'. */ + #undef HAVE_LONG_LONG_INT + /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY *************** *** 51,54 **** --- 65,71 ---- #undef HAVE_NDIR_H + /* Define to 1 if the system has the type `ptrdiff_t'. */ + #undef HAVE_PTRDIFF_T + /* Define to 1 if you have the `regcmp' function. */ #undef HAVE_REGCMP *************** *** 66,72 **** #undef HAVE_SIGSETJMP ! /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H --- 83,95 ---- #undef HAVE_SIGSETJMP ! /* Define to 1 if you have a C99 compliant `snprintf' function. */ #undef HAVE_SNPRINTF + /* Define to 1 if you have the <stdarg.h> header file. */ + #undef HAVE_STDARG_H + + /* Define to 1 if you have the <stddef.h> header file. */ + #undef HAVE_STDDEF_H + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H *************** *** 87,90 **** --- 110,119 ---- #undef HAVE_STRING_H + /* Define to 1 if `decimal_point' is member of `struct lconv'. */ + #undef HAVE_STRUCT_LCONV_DECIMAL_POINT + + /* Define to 1 if `thousands_sep' is member of `struct lconv'. */ + #undef HAVE_STRUCT_LCONV_THOUSANDS_SEP + /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ *************** *** 107,114 **** #undef HAVE_SYS_WINDOW_H /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H ! /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF --- 136,161 ---- #undef HAVE_SYS_WINDOW_H + /* Define to 1 if the system has the type `uintmax_t'. */ + #undef HAVE_UINTMAX_T + + /* Define to 1 if the system has the type `uintptr_t'. */ + #undef HAVE_UINTPTR_T + /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H ! /* Define to 1 if the system has the type `unsigned long long int'. */ ! #undef HAVE_UNSIGNED_LONG_LONG_INT ! ! /* Define to 1 if you have the <varargs.h> header file. */ ! #undef HAVE_VARARGS_H ! ! /* Define to 1 if you have the `vasprintf' function. */ ! #undef HAVE_VASPRINTF ! ! /* Define to 1 if you have the `va_copy' function or macro. */ ! #undef HAVE_VA_COPY ! ! /* Define to 1 if you have a C99 compliant `vsnprintf' function. */ #undef HAVE_VSNPRINTF *************** *** 116,122 **** #undef HAVE__SETMODE ! /* Define to 1 if `lstat' dereferences a symlink specified with a trailing ! slash. */ ! #undef LSTAT_FOLLOWS_SLASHED_SYMLINK /* We're using some variant of Linux */ --- 163,168 ---- #undef HAVE__SETMODE ! /* Define to 1 if you have the `__va_copy' function or macro. */ ! #undef HAVE___VA_COPY /* We're using some variant of Linux */ *************** *** 176,182 **** --- 222,235 ---- #undef YYTEXT_POINTER + /* Define to rpl_asprintf if the replacement function should be used. */ + #undef asprintf + /* Define to empty if `const' does not conform to ANSI C. */ #undef const + /* Define to the widest signed integer type if <stdint.h> and <inttypes.h> do + not define. */ + #undef intmax_t + /* Define to `int' if <sys/types.h> does not define. */ #undef mode_t *************** *** 187,188 **** --- 240,258 ---- /* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t + + /* Define to rpl_snprintf if the replacement function should be used. */ + #undef snprintf + + /* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h> + do not define. */ + #undef uintmax_t + + /* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ + #undef uintptr_t + + /* Define to rpl_vasprintf if the replacement function should be used. */ + #undef vasprintf + + /* Define to rpl_vsnprintf if the replacement function should be used. */ + #undef vsnprintf Index: configure =================================================================== RCS file: /cvsroot/cscope/cscope/configure,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** configure 30 Jun 2008 21:36:48 -0000 1.30 --- configure 10 Apr 2009 13:39:22 -0000 1.31 *************** *** 614,617 **** --- 614,618 ---- #endif" + ac_header_list= ac_subst_vars='SHELL PATH_SEPARATOR *************** *** 1686,1689 **** --- 1687,1692 ---- fi [...4686 lines suppressed...] + + + + + + + case " $LIBOBJS " in + *" snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" + ;; + esac + + _hw_cv_func_xprintf_replace_done=yes + fi + + + fi + Index: configure.in =================================================================== RCS file: /cvsroot/cscope/cscope/configure.in,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** configure.in 30 Sep 2006 17:31:14 -0000 1.34 --- configure.in 10 Apr 2009 13:39:23 -0000 1.35 *************** *** 402,408 **** AC_TYPE_SIGNAL AC_CHECK_FUNCS(strchr memcpy memset setmode _setmode) ! AC_CHECK_FUNCS(getcwd regcmp regcomp strerror vsnprintf snprintf lstat) AC_CHECK_FUNCS(fixkeypad) ! AC_FUNC_LSTAT case "$host_os" in --- 402,411 ---- AC_TYPE_SIGNAL AC_CHECK_FUNCS(strchr memcpy memset setmode _setmode) ! AC_CHECK_FUNCS(getcwd regcmp regcomp strerror lstat) AC_CHECK_FUNCS(fixkeypad) ! HW_FUNC_SNPRINTF ! HW_FUNC_VSNPRINTF ! HW_FUNC_ASPRINTF ! HW_FUNC_VASPRINTF case "$host_os" in Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.in 30 Jun 2008 21:36:48 -0000 1.10 --- Makefile.in 10 Apr 2009 13:39:23 -0000 1.11 *************** *** 44,48 **** subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 44,49 ---- subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ! $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2009-04-10 14:16:43
|
Update of /cvsroot/cscope/cscope/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099/doc Modified Files: Makefile.in Log Message: Replace all usage of (v)sprintf by (v)snprintf. Supply and use optional replacement snprintf on systems that don't have it. Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Makefile.in 30 Jun 2008 21:36:48 -0000 1.9 --- Makefile.in 10 Apr 2009 13:39:23 -0000 1.10 *************** *** 40,44 **** DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 40,45 ---- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ! $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2009-04-10 14:16:39
|
Update of /cvsroot/cscope/cscope/contrib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4099/contrib Modified Files: Makefile.in Log Message: Replace all usage of (v)sprintf by (v)snprintf. Supply and use optional replacement snprintf on systems that don't have it. Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.in 30 Jun 2008 21:36:48 -0000 1.10 --- Makefile.in 10 Apr 2009 13:39:23 -0000 1.11 *************** *** 41,45 **** DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 41,46 ---- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ! $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-06-30 21:36:52
|
Update of /cvsroot/cscope/cscope/doc In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23747/doc Modified Files: Makefile.in Log Message: Update by/to recent autotools. Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.in 30 Sep 2006 16:51:45 -0000 1.8 --- Makefile.in 30 Jun 2008 21:36:48 -0000 1.9 *************** *** 36,39 **** --- 36,40 ---- build_triplet = @build@ host_triplet = @host@ + LIBOBJDIR = subdir = doc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in *************** *** 77,80 **** --- 78,82 ---- GNOME_LINUX_FALSE = @GNOME_LINUX_FALSE@ GNOME_LINUX_TRUE = @GNOME_LINUX_TRUE@ + GREP = @GREP@ HAS_CURSES_FALSE = @HAS_CURSES_FALSE@ HAS_CURSES_TRUE = @HAS_CURSES_TRUE@ *************** *** 110,115 **** VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 112,117 ---- VERSION = @VERSION@ YACC = @YACC@ + YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ *************** *** 126,129 **** --- 128,134 ---- build_vendor = @build_vendor@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnome1 = @gnome1@ *************** *** 134,137 **** --- 139,143 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 139,148 **** --- 145,157 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-06-30 21:36:52
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23747/src Modified Files: Makefile.in Log Message: Update by/to recent autotools. Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** Makefile.in 30 Sep 2006 20:29:14 -0000 1.14 --- Makefile.in 30 Jun 2008 21:36:48 -0000 1.15 *************** *** 37,40 **** --- 37,41 ---- build_triplet = @build@ host_triplet = @host@ + LIBOBJDIR = @HAS_GNOME_TRUE@... = gscope$(EXEEXT) bin_PROGRAMS = cscope$(EXEEXT) *************** *** 142,145 **** --- 143,147 ---- GNOME_LINUX_FALSE = @GNOME_LINUX_FALSE@ GNOME_LINUX_TRUE = @GNOME_LINUX_TRUE@ + GREP = @GREP@ HAS_CURSES_FALSE = @HAS_CURSES_FALSE@ HAS_CURSES_TRUE = @HAS_CURSES_TRUE@ *************** *** 175,180 **** VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 177,182 ---- VERSION = @VERSION@ YACC = @YACC@ + YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ *************** *** 191,194 **** --- 193,199 ---- build_vendor = @build_vendor@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnome1 = @gnome1@ *************** *** 199,202 **** --- 204,208 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 204,213 **** --- 210,222 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-06-30 21:36:52
|
Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23747
Modified Files:
ChangeLog compile config.guess config.h.in config.sub
configure depcomp install-sh Makefile.in missing mkinstalldirs
ylwrap
Added Files:
INSTALL.gnu
Log Message:
Update by/to recent autotools.
--- NEW FILE ---
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -r1.176 -r1.177
*** ChangeLog 30 Jun 2008 21:16:02 -0000 1.176
--- ChangeLog 30 Jun 2008 21:36:48 -0000 1.177
***************
*** 1,4 ****
--- 1,14 ----
2008-06-30 Hans-Bernhard Broeker <broeker@...>
+ * aclocal.m4, configure, config.h.in, Makefile.in,
+ src/Makefile.in, doc/Makefile.in, contrib/Makefile.in: Regenerated
+ by recent autotools.
+
+ * compile, config.guess, config.sub, depcomp, install-sh, missing,
+ mkinstalldirs, ylwrap: Updated to version provided by recent
+ autotools.
+
+ * INSTALL.gnu: GNU installation instructions.
+
* src/global.h (tempstring): Fix mismatch of declaration with
definition.
Index: compile
===================================================================
RCS file: /cvsroot/cscope/cscope/compile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** compile 23 Jan 2003 17:30:40 -0000 1.1
--- compile 30 Jun 2008 21:36:48 -0000 1.2
***************
*** 1,7 ****
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
! # Copyright 1999, 2000 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@...>.
#
--- 1,8 ----
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
! scriptversion=2005-05-14.22
!
! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@...>.
#
***************
*** 18,22 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 19,23 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 25,76 ****
# the same distribution terms that you use for the rest of that program.
! # Usage:
! # compile PROGRAM [ARGS]...
! # `-o FOO.o' is removed from the args passed to the actual compile.
!
! prog=$1
! shift
ofile=
cfile=
! args=
! while test $# -gt 0; do
! case "$1" in
! -o)
! # configure might choose to run compile as `compile cc -o foo foo.c'.
! # So we do something ugly here.
! ofile=$2
! shift
! case "$ofile" in
! *.o | *.obj)
! ;;
! *)
! args="$args -o $ofile"
! ofile=
! ;;
! esac
! ;;
! *.c)
! cfile=$1
! args="$args $1"
! ;;
! *)
! args="$args $1"
! ;;
! esac
! shift
done
if test -z "$ofile" || test -z "$cfile"; then
! # If no `-o' option was seen then we might have been invoked from a
! # pattern rule where we don't need one. That is ok -- this is a
! # normal compilation that the losing compiler can handle. If no
! # `.c' file was seen then we are probably linking. That is also
! # ok.
! exec "$prog" $args
fi
# Name of file we expect compiler to create.
! cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
--- 26,108 ----
# the same distribution terms that you use for the rest of that program.
! # This file is maintained in Automake, please report
! # bugs to <bug-automake@...> or send patches to
! # <automake-patches@...>.
!
! case $1 in
! '')
! echo "$0: No command. Try \`$0 --help' for more information." 1>&2
! exit 1;
! ;;
! -h | --h*)
! cat <<\EOF
! Usage: compile [--help] [--version] PROGRAM [ARGS]
!
! Wrapper for compilers which do not understand `-c -o'.
! Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
! arguments, and rename the output as expected.
!
! If you are trying to build a whole package this is not the
! right script to run: please start by reading the file `INSTALL'.
!
! Report bugs to <bug-automake@...>.
! EOF
! exit $?
! ;;
! -v | --v*)
! echo "compile $scriptversion"
! exit $?
! ;;
! esac
ofile=
cfile=
! eat=
!
! for arg
! do
! if test -n "$eat"; then
! eat=
! else
! case $1 in
! -o)
! # configure might choose to run compile as `compile cc -o foo foo.c'.
! # So we strip `-o arg' only if arg is an object.
! eat=1
! case $2 in
! *.o | *.obj)
! ofile=$2
! ;;
! *)
! set x "$@" -o "$2"
! shift
! ;;
! esac
! ;;
! *.c)
! cfile=$1
! set x "$@" "$1"
! shift
! ;;
! *)
! set x "$@" "$1"
! shift
! ;;
! esac
! fi
! shift
done
if test -z "$ofile" || test -z "$cfile"; then
! # If no `-o' option was seen then we might have been invoked from a
! # pattern rule where we don't need one. That is ok -- this is a
! # normal compilation that the losing compiler can handle. If no
! # `.c' file was seen then we are probably linking. That is also
! # ok.
! exec "$@"
fi
# Name of file we expect compiler to create.
! cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
***************
*** 78,99 ****
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
! lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
while true; do
! if mkdir $lockdir > /dev/null 2>&1; then
! break
! fi
! sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
! trap "rmdir $lockdir; exit 1" 1 2 15
# Run the compile.
! "$prog" $args
! status=$?
if test -f "$cofile"; then
! mv "$cofile" "$ofile"
fi
! rmdir $lockdir
! exit $status
--- 110,142 ----
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
! lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
! if mkdir "$lockdir" >/dev/null 2>&1; then
! break
! fi
! sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
! trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
! "$@"
! ret=$?
if test -f "$cofile"; then
! mv "$cofile" "$ofile"
! elif test -f "${cofile}bj"; then
! mv "${cofile}bj" "$ofile"
fi
! rmdir "$lockdir"
! exit $ret
!
! # Local Variables:
! # mode: shell-script
! # sh-indentation: 2
! # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "scriptversion="
! # time-stamp-format: "%:y-%02m-%02d.%02H"
! # time-stamp-end: "$"
! # End:
Index: config.guess
===================================================================
RCS file: /cvsroot/cscope/cscope/config.guess,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** config.guess 23 Jan 2003 17:30:40 -0000 1.4
--- config.guess 30 Jun 2008 21:36:48 -0000 1.5
***************
*** 2,8 ****
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002 Free Software Foundation, Inc.
! timestamp='2002-11-30'
# This file is free software; you can redistribute it and/or modify it
--- 2,8 ----
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
[...1845 lines suppressed...]
c4*)
echo c4-convex-bsd
! exit ;;
esac
fi
***************
*** 1361,1365 ****
download the most up to date version of the config scripts from
! ftp://ftp.gnu.org/pub/gnu/config/
If the version you run ($0) is already up to date, please
--- 1422,1428 ----
download the most up to date version of the config scripts from
! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
! and
! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** config.h.in 21 Apr 2006 10:41:21 -0000 1.18
--- config.h.in 30 Jun 2008 21:36:48 -0000 1.19
***************
*** 185,188 ****
#undef pid_t
! /* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
--- 185,188 ----
#undef pid_t
! /* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
Index: config.sub
===================================================================
RCS file: /cvsroot/cscope/cscope/config.sub,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** config.sub 23 Jan 2003 17:30:41 -0000 1.3
--- config.sub 30 Jun 2008 21:36:48 -0000 1.4
***************
*** 2,8 ****
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002 Free Software Foundation, Inc.
! timestamp='2002-11-30'
# This file is (in principle) common to ALL GNU software.
--- 2,8 ----
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
! timestamp='2005-07-08'
# This file is (in principle) common to ALL GNU software.
***************
*** 22,28 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
!
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
--- 22,28 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
! # 02110-1301, USA.
! #
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
***************
*** 30,33 ****
--- 30,34 ----
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches@...>. Submit a context
# diff and a properly formatted ChangeLog entry.
***************
*** 71,75 ****
GNU config.sub ($timestamp)
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
--- 72,76 ----
GNU config.sub ($timestamp)
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
***************
*** 84,92 ****
case $1 in
--time-stamp | --time* | -t )
! echo "$timestamp" ; exit 0 ;;
--version | -v )
! echo "$version" ; exit 0 ;;
--help | --h* | -h )
! echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
--- 85,93 ----
case $1 in
--time-stamp | --time* | -t )
! echo "$timestamp" ; exit ;;
--version | -v )
! echo "$version" ; exit ;;
--help | --h* | -h )
! echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
***************
*** 100,104 ****
# First pass through any local machine types.
echo $1
! exit 0;;
* )
--- 101,105 ----
# First pass through any local machine types.
echo $1
! exit ;;
* )
***************
*** 119,123 ****
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
--- 120,125 ----
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
***************
*** 145,149 ****
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! -apple | -axis)
os=
basic_machine=$1
--- 147,151 ----
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
***************
*** 229,240 ****
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
! | ip2k \
! | m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
--- 231,244 ----
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! | bfin \
! | c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
! | ip2k | iq2000 \
! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
***************
*** 245,270 ****
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mipsisa32 | mipsisa32el \
| mipsisa64 | mipsisa64el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| ns16k | ns32k \
! | openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
! | tahoe | thumb | tic80 | tron \
| v850 | v850e \
| we32k \
! | x86 | xscale | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
--- 249,283 ----
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | ms1 \
+ | msp430 \
| ns16k | ns32k \
! | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
! | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
! | tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
+ m32c)
+ basic_machine=$basic_machine-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
***************
*** 294,300 ****
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
! | bs2000-* \
! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
! | clipper-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
--- 307,313 ----
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
! | bfin-* | bs2000-* \
! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
! | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
***************
*** 303,310 ****
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
! | ip2k-* \
! | m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
! | m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
--- 316,323 ----
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
! | ip2k-* | iq2000-* \
! | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
! | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
***************
*** 315,323 ****
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! | mipstx39 | mipstx39el \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
--- 328,342 ----
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! | mipstx39-* | mipstx39el-* \
! | mmix-* \
! | ms1-* \
! | msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
***************
*** 326,341 ****
| pyramid-* \
| romp-* | rs6000-* \
! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
! | xtensa-* \
| ymp-* \
| z8k-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
--- 345,365 ----
| pyramid-* \
| romp-* | rs6000-* \
! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
! | sparclite-* \
! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! | tahoe-* | thumb-* \
! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
! | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
+ m32c-*)
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
***************
*** 354,357 ****
--- 378,384 ----
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
***************
*** 368,371 ****
--- 395,404 ----
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
***************
*** 427,436 ****
--- 460,484 ----
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
***************
*** 455,458 ****
--- 503,510 ----
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
***************
*** 633,640 ****
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
--- 685,688 ----
***************
*** 724,730 ****
os=-proelf
;;
! or32 | or32-*)
basic_machine=or32-unknown
! os=-coff
;;
OSE68000 | ose68000)
--- 772,781 ----
os=-proelf
;;
! openrisc | openrisc-*)
basic_machine=or32-unknown
! ;;
! os400)
! basic_machine=powerpc-ibm
! os=-os400
;;
OSE68000 | ose68000)
***************
*** 759,765 ****
basic_machine=i686-pc
;;
! pentiumii | pentium2)
basic_machine=i686-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
--- 810,819 ----
basic_machine=i686-pc
;;
! pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
***************
*** 768,774 ****
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
! pentiumii-* | pentium2-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
--- 822,831 ----
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
! pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
***************
*** 829,832 ****
--- 886,893 ----
basic_machine=mipsisa64sb1el-unknown
;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
***************
*** 836,839 ****
--- 897,903 ----
os=-hms
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
***************
*** 902,909 ****
os=-dynix
;;
- t3d)
- basic_machine=alpha-cray
- os=-unicos
- ;;
t3e)
basic_machine=alphaev5-cray
--- 966,969 ----
***************
*** 914,925 ****
os=-unicos
;;
- tic4x | c4x*)
- basic_machine=tic4x-unknown
- os=-coff
- ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
tx39)
basic_machine=mipstx39-unknown
--- 974,989 ----
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
***************
*** 935,938 ****
--- 999,1006 ----
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
***************
*** 978,981 ****
--- 1046,1053 ----
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
***************
*** 1008,1011 ****
--- 1080,1086 ----
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
***************
*** 1024,1034 ****
basic_machine=we32k-att
;;
! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
basic_machine=sh-unknown
;;
! sh64)
! basic_machine=sh64-unknown
! ;;
! sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
--- 1099,1106 ----
basic_machine=we32k-att
;;
! sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
! sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
***************
*** 1103,1113 ****
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
! | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--- 1175,1186 ----
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
! | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
! | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
***************
*** 1115,1119 ****
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! | -powermax* | -dnix*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
--- 1188,1193 ----
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
! | -skyos* | -haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
***************
*** 1133,1137 ****
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
! | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
--- 1207,1211 ----
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
! | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
***************
*** 1139,1142 ****
--- 1213,1219 ----
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
***************
*** 1151,1154 ****
--- 1228,1234 ----
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
***************
*** 1172,1175 ****
--- 1252,1258 ----
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
***************
*** 1194,1197 ****
--- 1277,1283 ----
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
***************
*** 1224,1227 ****
--- 1310,1322 ----
os=-mint
;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
***************
*** 1255,1258 ****
--- 1350,1356 ----
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
***************
*** 1298,1304 ****
--- 1396,1408 ----
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
***************
*** 1433,1439 ****
--- 1537,1549 ----
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
***************
*** 1460,1464 ****
echo $basic_machine$os
! exit 0
# Local variables:
--- 1570,1574 ----
echo $basic_machine$os
! exit
# Local variables:
Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** configure 30 Sep 2006 17:31:14 -0000 1.29
--- configure 30 Jun 2008 21:36:48 -0000 1.30
***************
*** 1,7 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59.
#
! # 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.
[...11032 lines suppressed...]
***************
*** 7680,7688 ****
done
;;
esac
! done
! _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
--- 8080,8087 ----
done
;;
+
esac
! done # for ac_tag
{ (exit 0); exit 0; }
Index: depcomp
===================================================================
RCS file: /cvsroot/cscope/cscope/depcomp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** depcomp 23 Jan 2003 17:30:43 -0000 1.1
--- depcomp 30 Jun 2008 21:36:48 -0000 1.2
***************
*** 1,6 ****
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
! # Copyright 1999, 2000 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 1,8 ----
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
!
! scriptversion=2005-07-09.11
!
! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
***************
*** 16,21 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 18,23 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
! # 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 26,45 ****
# Originally written by Alexandre Oliva <oliva@...>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
- # `libtool' can also be set to `yes' or `no'.
-
- if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
- fi
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
--- 28,70 ----
# Originally written by Alexandre Oliva <oliva@...>.
+ case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+ Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+ Run PROGRAMS ARGS to compile a file, generating dependencies
+ as side-effects.
+
+ Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+ Report bugs to <bug-automake@...>.
+ EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+ esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
+ # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+ depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
***************
*** 173,182 ****
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
! # in a .u file. This file always lives in the current directory.
! # Also, the AIX compiler puts `$object:' at the start of each line;
! # $object doesn't have directory information.
! stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
- outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
--- 198,207 ----
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
! # in a .u file. In older versions, this file always lives in the
! # current directory. Also, the AIX compiler puts `$object:' at the
! # start of each line; $object doesn't have directory information.
! # Version 6 uses the directory in both cases.
! stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
if test "$libtool" = yes; then
"$@" -Wc,-M
***************
*** 184,189 ****
"$@" -M
fi
-
stat=$?
if test $stat -eq 0; then :
else
--- 209,220 ----
"$@" -M
fi
stat=$?
+
+ if test -f "$tmpdepfile"; then :
+ else
+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
+ tmpdepfile="$stripped.u"
+ fi
+
if test $stat -eq 0; then :
else
***************
*** 193,196 ****
--- 224,228 ----
if test -f "$tmpdepfile"; then
+ outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
***************
*** 207,210 ****
--- 239,280 ----
;;
+ icc)
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using \ :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
***************
*** 218,227 ****
if test "$libtool" = yes; then
! tmpdepfile1="$dir.libs/$base.lo.d"
! tmpdepfile2="$dir.libs/$base.d"
"$@" -Wc,-MD
else
! tmpdepfile1="$dir$base.o.d"
! tmpdepfile2="$dir$base.d"
"$@" -MD
fi
--- 288,314 ----
if test "$libtool" = yes; then
! # With Tru64 cc, shared objects can also be used to make a
! # static library. This mecanism is used in libtool 1.4 series to
! # handle both shared and static libraries in a single compilation.
! # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
! #
! # With libtool 1.5 this exception was removed, and libtool now
! # generates 2 separate objects for the 2 libraries. These two
! # compilations output dependencies in in $dir.libs/$base.o.d and
! # in $dir$base.o.d. We have to check for both files, because
! # one of the two compilations can be disabled. We should prefer
! # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
! # automatically cleaned when .libs/ is deleted, while ignoring
! # the former would cause a distcleancheck panic.
! tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
! tmpdepfile2=$dir$base.o.d # libtool 1.5
! tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
! tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
! tmpdepfile1=$dir$base.o.d
! tmpdepfile2=$dir$base.d
! tmpdepfile3=$dir$base.d
! tmpdepfile4=$dir$base.d
"$@" -MD
fi
***************
*** 230,246 ****
if test $stat -eq 0; then :
else
! rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
! if test -f "$tmpdepfile1"; then
! tmpdepfile="$tmpdepfile1"
! else
! tmpdepfile="$tmpdepfile2"
! fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
! # That's a space and a tab in the [].
! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
--- 317,332 ----
if test $stat -eq 0; then :
else
! rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
! for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
! do
! test -f "$tmpdepfile" && break
! done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
! # That's a tab and a space in the [].
! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
***************
*** 255,259 ****
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o.
"$@" || exit $?
--- 341,345 ----
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
! # always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
***************
*** 266,272 ****
fi
! # Remove `-o $object'. We will use -o /dev/null later,
! # however we can't do the remplacement now because
! # `-o $object' might simply not be used
IFS=" "
for arg
--- 352,356 ----
fi
! # Remove `-o $object'.
IFS=" "
for arg
***************
*** 288,292 ****
test -z "$dashmflag" && dashmflag=-M
! "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
--- 372,380 ----
test -z "$dashmflag" && dashmflag=-M
! # Require at least two characters before searching for `:'
! # in the target name. This is to cope with DOS-style filenames:
! # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
! "$@" $dashmflag |
! sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
***************
*** 307,310 ****
--- 395,405 ----
makedepend)
"$@" || exit $?
+ # Remove any Libtool call
+ if test "$libtool" = yes; then
+ while test $1 != '--mode=compile'; do
+ shift
+ done
+ shift
+ fi
# X makedepend
shift
***************
*** 319,323 ****
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
! -*)
;;
*)
--- 414,420 ----
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
! # Strip any option that makedepend may not understand. Remove
! # the object too, otherwise makedepend will parse it as a source file.
! -*|$object)
;;
*)
***************
*** 340,344 ****
cpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout.
"$@" || exit $?
--- 437,441 ----
cpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the preprocessed file to stdout.
"$@" || exit $?
***************
*** 371,375 ****
"$@" -E |
! sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
--- 468,473 ----
"$@" -E |
! sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
! -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
***************
*** 382,386 ****
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
--- 480,484 ----
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
***************
*** 422,423 ****
--- 520,530 ----
exit 0
+
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
+ # End:
Index: install-sh
===================================================================
RCS file: /cvsroot/cscope/cscope/install-sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** install-sh 23 Jan 2003 17:30:43 -0000 1.2
--- install-sh 30 Jun 2008 21:36:48 -0000 1.3
***************
*** 1,18 ****
#!/bin/sh
- #
# install - install a program, script, or datafile
! # This comes from X11R5 (mit/util/scripts/install.sh).
#
! # Copyright 1991 by the Massachusetts Institute of Technology
#
! # Permission to use, copy, modify, distribute, and sell this software and its
! # documentation for any purpose is hereby granted without fee, provided that
! # the above copyright notice appear in all copies and that both that
! # copyright notice and this permission notice appear in supporting
! # documentation, and that the name of M.I.T. not be used in advertising or
! # publicity pertaining to distribution of the software without specific,
! # written prior permission. M.I.T. makes no representations about the
! # suitability of this software for any purpose. It is provided "as is"
! # without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
--- 1,37 ----
#!/bin/sh
# install - install a program, script, or datafile
!
! scriptversion=2005-05-14.22
!
! # This originates from X11R5 (mit/util/scripts/install.sh), which was
! # later released in X11R6 (xc/config/util/install.sh) with the
! # following copyright and license.
! #
! # Copyright (C) 1994 X Consortium
! #
! # Permission is hereby granted, free of charge, to any person obtaining a copy
! # of this software and associated documentation files (the "Software"), to
! # deal in the Software without restriction, including without limitation the
! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
! # sell copies of the Software, and to permit persons to whom the Software is
! # furnished to do so, subject to the following conditions:
! #
! # The above copyright notice and this permission notice shall be included in
! # all copies or substantial portions of the Software.
#
! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
! # Except as contained in this notice, the name of the X Consortium shall not
! # be used in advertising or otherwise to promote the sale, use or other deal-
! # ings in this Software without prior written authorization from the X Consor-
! # tium.
! #
! #
! # FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
***************
*** 24,28 ****
# shared with many OS's install programs.
-
# set DOITPROG to echo to test this script
--- 43,46 ----
***************
*** 30,34 ****
doit="${DOITPROG-}"
-
# put in absolute paths if you don't have them in your path; or use env. vars.
--- 48,51 ----
***************
*** 42,276 ****
mkdirprog="${MKDIRPROG-mkdir}"
- transformbasename=""
- transform_arg=""
- instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
! chowncmd=""
! chgrpcmd=""
! stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
! src=""
! dst=""
! dir_arg=""
!
! while [ x"$1" != x ]; do
! case $1 in
! -c) instcmd=$cpprog
! shift
! continue;;
!
! -d) dir_arg=true
! shift
! continue;;
!
! -m) chmodcmd="$chmodprog $2"
! shift
! shift
! continue;;
!
! -o) chowncmd="$chownprog $2"
! shift
! shift
! continue;;
!
! -g) chgrpcmd="$chgrpprog $2"
! shift
! shift
! continue;;
!
! -s) stripcmd=$stripprog
! shift
! continue;;
!
! -t=*) transformarg=`echo $1 | sed 's/-t=//'`
! shift
! continue;;
!
! -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
! shift
! continue;;
!
! *) if [ x"$src" = x ]
! then
! src=$1
! else
! # this colon is to work around a 386BSD /bin/sh bug
! :
! dst=$1
! fi
! shift
! continue;;
! esac
! done
! if [ x"$src" = x ]
! then
! echo "$0: no input file specified" >&2
! exit 1
! else
! :
! fi
!
! if [ x"$dir_arg" != x ]; then
! dst=$src
! src=""
!
! if [ -d "$dst" ]; then
! instcmd=:
! chmodcmd=""
! else
! instcmd=$mkdirprog
! fi
! else
!
! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
! # might cause directories to be created, which would be especially bad
! # if $src (and thus $dsttmp) contains '*'.
!
! if [ -f "$src" ] || [ -d "$src" ]
! then
! :
! else
! echo "$0: $src does not exist" >&2
! exit 1
! fi
!
! if [ x"$dst" = x ]
! then
! echo "$0: no destination specified" >&2
! exit 1
! else
! :
! fi
!
! # If destination is a directory, append the input filename; if your system
! # does not like double slashes in filenames, you may need to add some logic
!
! if [ -d "$dst" ]
! then
! dst=$dst/`basename "$src"`
! else
! :
! fi
! fi
!
! ## this sed command emulates the dirname command
! dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
!
! # Make sure that the destination directory exists.
! # this part is taken from Noah Friedman's mkinstalldirs script
!
! # Skip lots of stat calls in the usual case.
! if [ ! -d "$dstdir" ]; then
! defaultIFS='
! '
! IFS="${IFS-$defaultIFS}"
!
! oIFS=$IFS
! # Some sh's can't handle IFS=/ for some reason.
! IFS='%'
! set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
! IFS=$oIFS
!
! pathcomp=''
! while [ $# -ne 0 ] ; do
! pathcomp=$pathcomp$1
shift
! if [ ! -d "$pathcomp" ] ;
! then
! $mkdirprog "$pathcomp"
! else
! :
! fi
! pathcomp=$pathcomp/
done
- fi
-
- if [ x"$dir_arg" != x ]
- then
- $doit $instcmd "$dst" &&
! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
! else
!
! # If we're going to rename the final executable, determine the name now.
!
! if [ x"$transformarg" = x ]
! then
! dstfile=`basename "$dst"`
! else
! dstfile=`basename "$dst" $transformbasename |
! sed $transformarg`$transformbasename
! fi
!
! # don't allow the sed command to completely eliminate the filename
!
! if [ x"$dstfile" = x ]
! then
! dstfile=`basename "$dst"`
! else
! :
! fi
!
! # Make a couple of temp file names in the proper directory.
!
! dsttmp=$dstdir/#inst.$$#
! rmtmp=$dstdir/#rm.$$#
!
! # Trap to clean up temp files at exit.
!
! trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
! trap '(exit $?); exit' 1 2 13 15
!
! # Move or copy the file name to the temp name
!
! $doit $instcmd "$src" "$dsttmp" &&
!
! # and set any options; do chmod last to preserve setuid bits
!
! # If any of these fail, we abort the whole thing. If we want to
! # ignore errors from any of these, just make sure not to ignore
! # errors from the above "$doit $instcmd $src $dsttmp" command.
!
! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
!
! # Now remove or move aside any old file at destination location. We try this
! # two ways since rm can't unlink itself on some systems and the destination
! # file might be busy for other reasons. In this case, the final cleanup
! # might fail but the new file should still install successfully.
!
! {
! if [ -f "$dstdir/$dstfile" ]
! then
! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
! $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
! {
! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
! (exit 1); exit
! }
! else
! :
! fi
! } &&
!
! # Now rename the file to the real destination.
! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
! fi &&
# The final little trick to "correctly" pass the exit status to the exit trap.
-
{
! (exit 0); exit
}
--- 59,323 ----
mkdirprog="${MKDIRPROG-mkdir}"
chmodcmd="$chmodprog 0755"
! chowncmd=
! chgrpcmd=
! stripcmd=
rmcmd="$rmprog -f"
mvcmd="$mvprog"
! src=
! dst=
! dir_arg=
! dstarg=
! no_target_directory=
!
! usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
! or: $0 [OPTION]... SRCFILES... DIRECTORY
! or: $0 [OPTION]... -t DIRECTORY SRCFILES...
! or: $0 [OPTION]... -d DIRECTORIES...
!
! In the 1st form, copy SRCFILE to DSTFILE.
! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
! In the 4th, create DIRECTORIES.
!
! Options:
! -c (ignored)
! -d create directories instead of installing files.
! -g GROUP $chgrpprog installed files to GROUP.
! -m MODE $chmodprog installed files to MODE.
! -o USER $chownprog installed files to USER.
! -s $stripprog installed files.
! -t DIRECTORY install into DIRECTORY.
! -T report an error if DSTFILE is a directory.
! --help display this help and exit.
! --version display version info and exit.
!
! Environment variables override the default commands:
! CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
! "
!
! while test -n "$1"; do
! case $1 in
! -c) shift
! continue;;
!
! -d) dir_arg=true
! shift
! continue;;
!
! -g) chgrpcmd="$chgrpprog $2"
! shift
! shift
! continue;;
!
! --help) echo "$usage"; exit $?;;
!
! -m) chmodcmd="$chmodprog $2"
! shift
! shift
! continue;;
!
! -o) chowncmd="$chownprog $2"
! shift
! shift
! continue;;
!
! -s) stripcmd=$stripprog
! shift
! continue;;
! -t) dstarg=$2
! shift
! shift
! continue;;
! -T) no_target_directory=true
shift
+ continue;;
! --version) echo "$0 $scriptversion"; exit $?;;
! *) # When -d is used, all remaining arguments are directories to create.
! # When -t is used, the destination is already specified.
! test -n "$dir_arg$dstarg" && break
! # Otherwise, the last argument is the destination. Remove it from $@.
! for arg
! do
! if test -n "$dstarg"; then
! # $@ is not empty: it contains at least $arg.
! set fnord "$@" "$dstarg"
! shift # fnord
! fi
! shift # arg
! dstarg=$arg
! done
! break;;
! esac
done
! if test -z "$1"; then
! if test -z "$dir_arg"; then
! echo "$0: no input file specified." >&2
! exit 1
! fi
! # It's OK to call `install-sh -d' without argument.
! # This can happen when creating conditional directories.
! exit 0
! fi
! for src
! do
! # Protect names starting with `-'.
! case $src in
! -*) src=./$src ;;
! esac
!
! if test -n "$dir_arg"; then
! dst=$src
! src=
!
! if test -d "$dst"; then
! mkdircmd=:
! chmodcmd=
! else
! mkdircmd=$mkdirprog
! fi
! else
! # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
! # might cause directories to be created, which would be especially bad
! # if $src (and thus $dsttmp) contains '*'.
! if test ! -f "$src" && test ! -d "$src"; then
! echo "$0: $src does not exist." >&2
! exit 1
! fi
!
! if test -z "$dstarg"; then
! echo "$0: no destination specified." >&2
! exit 1
! fi
!
! dst=$dstarg
! # Protect names starting with `-'.
! case $dst in
! -*) dst=./$dst ;;
! esac
! # If destination is a directory, append the input filename; won't work
! # if double slashes aren't ignored.
! if test -d "$dst"; then
! if test -n "$no_target_directory"; then
! echo "$0: $dstarg: Is a directory" >&2
! exit 1
! fi
! dst=$dst/`basename "$src"`
! fi
! fi
!
! # This sed command emulates the dirname command.
! dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
!
! # Make sure that the destination directory exists.
!
! # Skip lots of stat calls in the usual case.
! if test ! -d "$dstdir"; then
! defaultIFS='
! '
! IFS="${IFS-$defaultIFS}"
!
! oIFS=$IFS
! # Some sh's can't handle IFS=/ for some reason.
! IFS='%'
! set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
! shift
! IFS=$oIFS
!
! pathcomp=
!
! while test $# -ne 0 ; do
! pathcomp=$pathcomp$1
! shift
! if test ! -d "$pathcomp"; then
! $mkdirprog "$pathcomp"
! # mkdir can fail with a `File exist' error in case several
! # install-sh are creating the directory concurrently. This
! # is OK.
! test -d "$pathcomp" || exit
! fi
! pathcomp=$pathcomp/
! done
! fi
!
! if test -n "$dir_arg"; then
! $doit $mkdircmd "$dst" \
! && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
! && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
! && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
!
! else
! dstfile=`basename "$dst"`
!
! # Make a couple of temp file names in the proper directory.
! dsttmp=$dstdir/_inst.$$_
! rmtmp=$dstdir/_rm.$$_
!
! # Trap to clean up those temp files at exit.
! trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
! trap '(exit $?); exit' 1 2 13 15
!
! # Copy the file name to the temp name.
! $doit $cpprog "$src" "$dsttmp" &&
!
! # and set any options; do chmod last to preserve setuid bits.
! #
! # If any of these fail, we abort the whole thing. If we want to
! # ignore errors from any of these, just make sure not to ignore
! # errors from the above "$doit $cpprog $src $dsttmp" command.
! #
! { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
! && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
! && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
!
! # Now rename the file to the real destination.
! { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
! || {
! # The rename failed, perhaps because mv can't rename something else
! # to itself, or perhaps because mv is so ancient that it does not
! # support -f.
!
! # Now remove or move aside any old file at destination location.
! # We try this two ways since rm can't unlink itself on some
! # systems and the destination file might be busy for other
! # reasons. In this case, the final cleanup might fail but the new
! # file should still install successfully.
! {
! if test -f "$dstdir/$dstfile"; then
! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
! || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
! || {
! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
! (exit 1); exit 1
! }
! else
! :
! fi
! } &&
!
! # Now rename the file to the real destination.
! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
! }
! }
! fi || { (exit 1); exit 1; }
! done
# The final little trick to "correctly" pass the exit status to the exit trap.
{
! (exit 0); exit 0
}
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
+ # End:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cscope/cscope/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in 30 Sep 2006 16:51:45 -0000 1.9
--- Makefile.in 30 Jun 2008 21:36:48 -0000 1.10
***************
*** 36,39 ****
--- 36,40 ----
build_triplet = @build@
host_triplet = @host@
+ LIBOBJDIR =
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
***************
*** 98,101 ****
--- 99,103 ----
GNOME_LINUX_FALSE = @GNOME_LINUX_FALSE@
GNOME_LINUX_TRUE = @GNOME_LINUX_TRUE@
+ GREP = @GREP@
HAS_CURSES_FALSE = @HAS_CURSES_FALSE@
HAS_CURSES_TRUE = @HAS_CURSES_TRUE@
***************
*** 131,136 ****
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
- ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 133,138 ----
VERSION = @VERSION@
YACC = @YACC@
+ YFLAGS = @YFLAGS@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
***************
*** 147,150 ****
--- 149,155 ----
build_vendor = @build_vendor@
datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
exec_prefix = @exec_prefix@
gnome1 = @gnome1@
***************
*** 155,158 ****
--- 160,164 ----
host_os = @host_os@
host_vendor = @host_vendor@
+ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
***************
*** 160,169 ****
--- 166,178 ----
libdir = @libdir@
libexecdir = @libexecdir@
+ localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
Index: missing
===================================================================
RCS file: /cvsroot/cscope/cscope/missing,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** missing 23 Jan 2003 17:30:43 -0000 1.2
--- missing 30 Jun 2008 21:36:48 -0000 1.3
***************
*** 1,5 ****
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@...>, 1996.
--- 1,9 ----
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
!
! scriptversion=2005-06-08.21
!
! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
! # Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@...>, 1996.
***************
*** 16,21 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 20,25 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
! # 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 39,42 ****
--- 43,48 ----
fi
+ msg="missing on your system"
+
case "$1" in
--run)
***************
*** 45,54 ****
shift
"$@" && exit 0
;;
- esac
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
- case "$1" in
-h|--h|--he|--hel|--help)
--- 51,64 ----
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-h|--h|--he|--hel|--help)
***************
*** 75,83 ****
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
! yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing 0.4 - GNU automake"
;;
--- 85,97 ----
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
! yacc create \`y.tab.[ch]', if possible, from existing .[ch]
!
! Send bug reports to <bug-automake@...>."
! exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing $scriptversion (GNU Automake)"
! exit $?
;;
***************
*** 88,99 ****
;;
! aclocal*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
--- 102,143 ----
;;
! esac
!
! # Now exit if we have it, but it failed. Also exit now if we
! # don't have it and --version was passed (most likely to detect
! # the program).
! case "$1" in
! lex|yacc)
! # Not GNU programs, they don't have --version.
! ;;
!
! tar)
! if test -n "$run"; then
! echo 1>&2 "ERROR: \`tar' requires --run"
! exit 1
! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
! exit 1
! fi
! ;;
!
! *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+ esac
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+ case "$1" in
+ aclocal*)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
***************
*** 103,113 ****
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
--- 147,152 ----
autoconf)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
***************
*** 117,127 ****
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
--- 156,161 ----
autoheader)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
***************
*** 141,151 ****
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
--- 175,180 ----
automake*)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
***************
*** 157,170 ****
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is needed, and you do not seem to have it handy on your
! system. You might have modified some files without having the
proper tools for further handling them.
! You can get \`$1Help2man' as part of \`Autoconf' from any GNU
archive site."
--- 186,194 ----
autom4te)
echo 1>&2 "\
! WARNING: \`$1' is needed, but is $msg.
! You might have modified some files without having the
proper tools for further handling them.
! You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
***************
*** 186,190 ****
bison|yacc)
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
--- 210,214 ----
bison|yacc)
echo 1>&2 "\
! WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
***************
*** 216,220 ****
lex|flex)
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
--- 240,244 ----
lex|flex)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
***************
*** 238,248 ****
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
--- 262,267 ----
help2man)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
***************
*** 263,273 ****
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
--- 282,287 ----
makeinfo)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
***************
*** 275,283 ****
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
! fi
touch $file
;;
--- 289,304 ----
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
! # ... or it is the one specified with @setfilename ...
! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
! # ... or it is derived from the source name (dir/f.texi becomes f.info)
! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
! fi
! # If the file does not exist, the user really needs makeinfo;
! # let's fail without touching anything.
! test -f $file || exit 1
touch $file
;;
***************
*** 285,292 ****
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
--- 306,309 ----
***************
*** 324,331 ****
*)
echo 1>&2 "\
! WARNING: \`$1' is needed, and you do not seem to have it handy on your
! system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
! it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
--- 341,348 ----
*)
echo 1>&2 "\
! WARNING: \`$1' is needed, and is $msg.
! You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
! it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
***************
*** 335,336 ****
--- 352,360 ----
exit 0
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
+ # End:
Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/cscope/cscope/mkinstalldirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mkinstalldirs 23 Jan 2003 17:30:43 -0000 1.2
--- mkinstalldirs 30 Jun 2008 21:36:48 -0000 1.3
***************
*** 1,13 ****
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
! # Author: Noah Friedman <friedman@...>
# Created: 1993-05-16
! # Public domain
errstatus=0
! dirmode=""
usage="\
! Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments
--- 1,25 ----
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
!
! scriptversion=2005-06-29.22
!
! # Original author: Noah Friedman <friedman@...>
# Created: 1993-05-16
! # Public domain.
! #
! # This file is maintained in Automake, please report
! # bugs to <bug-automake@...> or send patches to
! # <automake-patches@...>.
errstatus=0
! dirmode=
usage="\
! Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
!
! Create each directory DIR (with mode MODE, if specified), including all
! leading file name components.
!
! Report bugs to <bug-automake@...>."
# process command line arguments
***************
*** 15,20 ****
case $1 in
-h | --help | --h*) # -h for help
! echo "$usage" 1>&2
! exit 0
;;
-m) # -m PERM arg
--- 27,32 ----
case $1 in
-h | --help | --h*) # -h for help
! echo "$usage"
! exit $?
;;
-m) # -m PERM arg
***************
*** 24,27 ****
--- 36,43 ----
shift
;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
--) # stop option processing
shift
***************
*** 51,65 ****
esac
case $dirmode in
'')
! if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
fi
;;
*)
! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
fi
;;
--- 67,101 ----
esac
+ # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+ # mkdir -p a/c at the same time, both will detect that a is missing,
+ # one will create a, then the other will try to create a and die with
+ # a "File exists" error. This is a problem when calling mkinstalldirs
+ # from a parallel make. We use --version in the probe to restrict
+ # ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
! if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
fi
;;
*)
! if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
! test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
fi
;;
***************
*** 68,78 ****
for file
do
! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
- pathcomp=
for d
do
! pathcomp="$pathcomp$d"
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
--- 104,122 ----
for file
do
! case $file in
! /*) pathcomp=/ ;;
! *) pathcomp= ;;
! esac
! oIFS=$IFS
! IFS=/
! set fnord $file
shift
+ IFS=$oIFS
for d
do
! test "x$d" = x && continue
!
! pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
***************
*** 85,103 ****
if test ! -d "$pathcomp"; then
! errstatus=$lasterr
else
! if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
! lasterr=""
! chmod "$dirmode" "$pathcomp" || lasterr=$?
! if test ! -z "$lasterr"; then
! errstatus=$lasterr
! fi
! fi
fi
fi
! pathcomp="$pathcomp/"
done
done
--- 129,147 ----
if test ! -d "$pathcomp"; then
! errstatus=$lasterr
else
! if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
! lasterr=
! chmod "$dirmode" "$pathcomp" || lasterr=$?
! if test ! -z "$lasterr"; then
! errstatus=$lasterr
! fi
! fi
fi
fi
! pathcomp=$pathcomp/
done
done
***************
*** 108,111 ****
# mode: shell-script
# sh-indentation: 2
# End:
- # mkinstalldirs ends here
--- 152,158 ----
# mode: shell-script
# sh-indentation: 2
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
# End:
Index: ylwrap
===================================================================
RCS file: /cvsroot/cscope/cscope/ylwrap,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ylwrap 23 Jan 2003 17:30:43 -0000 1.1
--- ylwrap 30 Jun 2008 21:36:48 -0000 1.2
***************
*** 1,7 ****
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
! #
! # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002 Free Software
! # Foundation, Inc.
#
# Written by Tom Tromey <tromey@...>.
--- 1,9 ----
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
!
! scriptversion=2005-05-14.22
!
! # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
! # Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey@...>.
***************
*** 19,23 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 21,26 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
! # 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 26,37 ****
# the same distribution terms that you use for the rest of that program.
! # Usage:
! # ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
! # * INPUT is the input file
! # * OUTPUT is file PROG generates
! # * DESIRED is file we actually want
! # * PROGRAM is program to run
! # * ARGS are passed to PROG
! # Any number of OUTPUT,DESIRED pairs may be used.
# The input.
--- 29,69 ----
# the same distribution terms that you use for the rest of that program.
! # This file is maintained in Automake, please report
! # bugs to <bug-automake@...> or send patches to
! # <automake-patches@...>.
!
! case "$1" in
! '')
! echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
! exit 1
! ;;
! --basedir)
! basedir=$2
! shift 2
! ;;
! -h|--h*)
! cat <<\EOF
! Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
!
! Wrapper for lex/yacc invocations, renaming files as desired.
!
! INPUT is the input file
! OUTPUT is one file PROG generates
! DESIRED is the file we actually want instead of OUTPUT
! PROGRAM is program to run
! ARGS are passed to PROG
!
! Any number of OUTPUT,DESIRED pairs may be used.
!
! Report bugs to <bug-automake@...>.
! EOF
! exit $?
! ;;
! -v|--v*)
! echo "ylwrap $scriptversion"
! exit $?
! ;;
! esac
!
# The input.
***************
*** 39,46 ****
shift
case "$input" in
! [\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
! *)
# Relative path. Make it absolute.
input="`pwd`/$input"
--- 71,78 ----
shift
case "$input" in
! [\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
! *)
# Relative path. Make it absolute.
input="`pwd`/$input"
***************
*** 50,59 ****
pairlist=
while test "$#" -ne 0; do
! if test "$1" = "--"; then
! shift
! break
! fi
! pairlist="$pairlist $1"
! shift
done
--- 82,91 ----
pairlist=
while test "$#" -ne 0; do
! if test "$1" = "--"; then
! shift
! break
! fi
! pairlist="$pairlist $1"
! shift
done
***************
*** 63,68 ****
# Make any relative path in $prog absolute.
case "$prog" in
! [\\/]* | ?:[\\/]*) ;;
! *[\\/]*) prog="`pwd`/$prog" ;;
esac
--- 95,100 ----
# Make any relative path in $prog absolute.
case "$prog" in
! [\\/]* | ?:[\\/]*) ;;
! *[\\/]*) prog="`pwd`/$prog" ;;
esac
***************
*** 76,155 ****
case $# in
! 0) $prog "$input" ;;
! *) $prog "$@" "$input" ;;
esac
! status=$?
! if test $status -eq 0; then
! set X $pairlist
! shift
! first=yes
! # Since DOS filename conventions don't allow two dots,
! # the DOS version of Bison writes out y_tab.c instead of y.tab.c
! # and y_tab.h instead of y.tab.h. Test to see if this is the case.
! y_tab_nodot="no"
! if test -f y_tab.c || test -f y_tab.h; then
! y_tab_nodot="yes"
! fi
!
! # The directory holding the input.
! input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
! # Quote $INPUT_DIR so we can use it in a regexp.
! # FIXME: really we should care about more than `.' and `\'.
! input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
!
! while test "$#" -ne 0; do
! from="$1"
! # Handle y_tab.c and y_tab.h output by DOS
! if test $y_tab_nodot = "yes"; then
! if test $from = "y.tab.c"; then
! from="y_tab.c"
! else
! if test $from = "y.tab.h"; then
! from="y_tab.h"
! fi
! fi
! fi
! if test -f "$from"; then
! # If $2 is an absolute path name, then just use that,
! # otherwise prepend `../'.
! case "$2" in
! [\\/]* | ?:[\\/]*) target="$2";;
! *) target="../$2";;
! esac
!
! # Edit out `#line' or `#' directives.
! #
! # We don't want the resulting debug information to point at
! # an absolute srcdir; it is better for it to just mention the
! # .y file with no path.
! #
! # We want to use the real output file name, not yy.lex.c for
! # instance.
! #
! # We want the include guards to be adjusted too.
! FROM=`echo "$from" | sed \
! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
! -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
! TARGET=`echo "$2" | sed \
! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
! -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
! sed "/^#/{s,$input_rx,,;s,$from,$2,;s,$FORM,$TO,;}" "$from" >"$target" ||
! status=$?
else
! # A missing file is only an error for the first file. This
! # is a blatant hack to let us support using "yacc -d". If -d
! # is not specified, we don't want an error when the header
! # file is "missing".
! if test $first = yes; then
! status=1
! fi
fi
! shift
! shift
! first=no
! done
else
! status=$?
fi
--- 108,209 ----
case $# in
! 0) $prog "$input" ;;
! *) $prog "$@" "$input" ;;
esac
! ret=$?
! if test $ret -eq 0; then
! set X $pairlist
! shift
! first=yes
! # Since DOS filename conventions don't allow two dots,
! # the DOS version of Bison writes out y_tab.c instead of y.tab.c
! # and y_tab.h instead of y.tab.h. Test to see if this is the case.
! y_tab_nodot="no"
! if test -f y_tab.c || test -f y_tab.h; then
! y_tab_nodot="yes"
! fi
!
! # The directory holding the input.
! input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
! # Quote $INPUT_DIR so we can use it in a regexp.
! # FIXME: really we should care about more than `.' and `\'.
! input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
!
! while test "$#" -ne 0; do
! from="$1"
! # Handle y_tab.c and y_tab.h output by DOS
! if test $y_tab_nodot = "yes"; then
! if test $from = "y.tab.c"; then
! from="y_tab.c"
else
! if test $from = "y.tab.h"; then
! from="y_tab.h"
! fi
! fi
! fi
! if test -f "$from"; then
! # If $2 is an absolute path name, then just use that,
! # otherwise prepend `../'.
! case "$2" in
! [\\/]* | ?:[\\/]*) target="$2";;
! *) target="../$2";;
! esac
!
! # We do not want to overwrite a header file if it hasn't
! # changed. This avoid useless recompilations. However the
! # parser itself (the first file) should always be updated,
! # because it is the destination of the .y.c rule in the
! # Makefile. Divert the output of all other files to a temporary
! # file so we can compare them to existing versions.
! if test $first = no; then
! realtarget="$target"
! target="tmp-`echo $target | sed s/.*[\\/]//g`"
fi
! # Edit out `#line' or `#' directives.
! #
! # We don't want the resulting debug information to point at
! # an absolute srcdir; it is better for it to just mention the
! # .y file with no path.
! #
! # We want to use the real output file name, not yy.lex.c for
! # instance.
! #
! # We want the include guards to be adjusted too.
! FROM=`echo "$from" | sed \
! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
! -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
! TARGET=`echo "$2" | sed \
! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
! -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
!
! sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
! -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
!
! # Check whether header files must be updated.
! if test $first = no; then
! if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
! echo "$2" is unchanged
! rm -f "$target"
! else
! echo updating "$2"
! mv -f "$target" "$realtarget"
! fi
! fi
! else
! # A missing file is only an error for the first file. This
! # is a blatant hack to let us support using "yacc -d". If -d
! # is not specified, we don't want an error when the header
! # file is "missing".
! if test $first = yes; then
! ret=1
! fi
! fi
! shift
! shift
! first=no
! done
else
! ret=$?
fi
***************
*** 158,160 ****
rm -rf $dirname
! exit $status
--- 212,223 ----
rm -rf $dirname
! exit $ret
!
! # Local Variables:
! # mode: shell-script
! # sh-indentation: 2
! # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "scriptversion="
! # time-stamp-format: "%:y-%02m-%02d.%02H"
! # time-stamp-end: "$"
! # End:
|
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-06-30 21:36:51
|
Update of /cvsroot/cscope/cscope/contrib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23747/contrib Modified Files: Makefile.in Log Message: Update by/to recent autotools. Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Makefile.in 30 Sep 2006 16:51:45 -0000 1.9 --- Makefile.in 30 Jun 2008 21:36:48 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- build_triplet = @build@ host_triplet = @host@ + LIBOBJDIR = subdir = contrib DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in *************** *** 77,80 **** --- 78,82 ---- GNOME_LINUX_FALSE = @GNOME_LINUX_FALSE@ GNOME_LINUX_TRUE = @GNOME_LINUX_TRUE@ + GREP = @GREP@ HAS_CURSES_FALSE = @HAS_CURSES_FALSE@ HAS_CURSES_TRUE = @HAS_CURSES_TRUE@ *************** *** 110,115 **** VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 112,117 ---- VERSION = @VERSION@ YACC = @YACC@ + YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ *************** *** 126,129 **** --- 128,134 ---- build_vendor = @build_vendor@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnome1 = @gnome1@ *************** *** 134,137 **** --- 139,143 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 139,148 **** --- 145,157 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-06-30 21:16:07
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15607 Modified Files: ChangeLog Log Message: Fix mismatch of decl/defn for global variable tempstring Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.175 retrieving revision 1.176 diff -C2 -r1.175 -r1.176 *** ChangeLog 11 Apr 2008 11:23:55 -0000 1.175 --- ChangeLog 30 Jun 2008 21:16:02 -0000 1.176 *************** *** 1,6 **** 2008-04-11 Neil Horman <nhorman@...> ! * src/main.c, src/exec.c : configure ncurses to operate in raw ! mode so that ctrl-c (toggle case sensitivity) isn't swallowed ! by the terminal driver 2008-03-12 Hans-Bernhard Broeker <broeker@...> --- 1,11 ---- + 2008-06-30 Hans-Bernhard Broeker <broeker@...> + + * src/global.h (tempstring): Fix mismatch of declaration with + definition. + 2008-04-11 Neil Horman <nhorman@...> ! * src/main.c, src/exec.c : configure ncurses to operate in raw ! mode so that ctrl-c (toggle case sensitivity) isn't swallowed by ! the terminal driver 2008-03-12 Hans-Bernhard Broeker <broeker@...> *************** *** 11,29 **** 2008-03-10 Neil Horman <nhorman@...> ! * src/build.c: Fix Samelist to properly absorb newlines ! so that inverted indicies aren't always rebuilt 2008-02-14 Neil Horman <nhorman@...> ! * src/dir.c: Fix up issrcfile to identify hpp/hxx files ! as standard c++ source files ! * src/main.c: Add myexit as a handler for SIGTERM, to ! clean up temp files on TERM 2007-12-03 Hans-Bernhard Broeker <broeker@...> ! * doc/cscope.1: Grammar corrections [SF patch #1843711] and ! troff syntax fixes [from ESR]. 2007-03-10 Hans-Bernhard Broeker <broeker@...> --- 16,35 ---- 2008-03-10 Neil Horman <nhorman@...> ! ! * src/build.c: Fix Samelist to properly absorb newlines so that ! inverted indicies aren't always rebuilt 2008-02-14 Neil Horman <nhorman@...> ! * src/dir.c: Fix up issrcfile to identify hpp/hxx files as ! standard c++ source files ! * src/main.c: Add myexit as a handler for SIGTERM, to clean up ! temp files on TERM 2007-12-03 Hans-Bernhard Broeker <broeker@...> ! * doc/cscope.1: Grammar corrections [SF patch #1843711] and troff ! syntax fixes [from ESR]. 2007-03-10 Hans-Bernhard Broeker <broeker@...> |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-06-30 21:16:06
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15607/src Modified Files: global.h Log Message: Fix mismatch of decl/defn for global variable tempstring Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** global.h 23 Jul 2006 20:59:20 -0000 1.35 --- global.h 30 Jun 2008 21:16:02 -0000 1.36 *************** *** 249,253 **** extern long totalterms; /* total inverted index terms */ extern BOOL trun_syms; /* truncate symbols to 8 characters */ ! extern char tempstring[8192]; /* global dummy string buffer */ extern char *tmpdir; /* temporary directory */ --- 249,253 ---- extern long totalterms; /* total inverted index terms */ extern BOOL trun_syms; /* truncate symbols to 8 characters */ ! extern char tempstring[TEMPSTRING_LEN + 1]; /* global dummy string buffer */ extern char *tmpdir; /* temporary directory */ |
|
From: Neil Horman <nhorman@us...> - 2008-04-11 11:24:06
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6650 Modified Files: ChangeLog Log Message: Converting ncurses to use raw mode Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -r1.174 -r1.175 *** ChangeLog 12 Mar 2008 22:41:29 -0000 1.174 --- ChangeLog 11 Apr 2008 11:23:55 -0000 1.175 *************** *** 1,2 **** --- 1,7 ---- + 2008-04-11 Neil Horman <nhorman@...> + * src/main.c, src/exec.c : configure ncurses to operate in raw + mode so that ctrl-c (toggle case sensitivity) isn't swallowed + by the terminal driver + 2008-03-12 Hans-Bernhard Broeker <broeker@...> |
|
From: Neil Horman <nhorman@us...> - 2008-04-11 11:24:01
|
Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6650/src
Modified Files:
exec.c main.c
Log Message:
Converting ncurses to use raw mode
Index: exec.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/exec.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** exec.c 21 Apr 2006 10:45:48 -0000 1.10
--- exec.c 11 Apr 2008 11:23:55 -0000 1.11
***************
*** 100,104 ****
nonl();
# endif
! cbreak(); /* endwin() turns off cbreak mode so restore it */
noecho();
#endif
--- 100,104 ----
nonl();
# endif
! raw(); /* endwin() turns off cbreak mode so restore it */
noecho();
#endif
Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** main.c 14 Feb 2008 12:39:37 -0000 1.44
--- main.c 11 Apr 2008 11:23:55 -0000 1.45
***************
*** 800,804 ****
nonl(); /* don't translate an output \n to \n\r */
#endif
! cbreak(); /* single character input */
noecho(); /* don't echo input characters */
clear(); /* clear the screen */
--- 800,804 ----
nonl(); /* don't translate an output \n to \n\r */
#endif
! raw(); /* single character input */
noecho(); /* don't echo input characters */
clear(); /* clear the screen */
|
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-03-12 22:41:32
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3730 Modified Files: ChangeLog Log Message: Amend and extend previous fix for fgets() breaking directory/file list comparisons Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.173 retrieving revision 1.174 diff -C2 -r1.173 -r1.174 *** ChangeLog 10 Mar 2008 18:33:47 -0000 1.173 --- ChangeLog 12 Mar 2008 22:41:29 -0000 1.174 *************** *** 1,2 **** --- 1,8 ---- + 2008-03-12 Hans-Bernhard Broeker <broeker@...> + + * src/build.c (samelist): Previous fix broke handling of blanks in + directory names. + (build): Apply the same fix to other occurence of the same code. + 2008-03-10 Neil Horman <nhorman@...> * src/build.c: Fix Samelist to properly absorb newlines *************** *** 24,27 **** --- 30,34 ---- 2007-02-09 Neil Horman <nhorman@...> + * doc/xcscope.1: Added man page for xcscope utility in contrib |
|
From: Hans-Bernhard Broeker <broeker@us...> - 2008-03-12 22:40:54
|
Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3355
Modified Files:
build.c
Log Message:
Amend and extend previous fix for fgets() breaking directory/file list comparisons
Index: build.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/build.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** build.c 10 Mar 2008 18:33:47 -0000 1.13
--- build.c 12 Mar 2008 22:40:47 -0000 1.14
***************
*** 116,123 ****
char oldname[PATHLEN + 1]; /* name in old cross-reference */
int oldcount;
! int i, matchcnt;
/* see if the number of names is the same */
! if (fscanf(oldrefs, "%d\n", &oldcount) != 1 ||
oldcount != count) {
return(NO);
--- 116,123 ----
char oldname[PATHLEN + 1]; /* name in old cross-reference */
int oldcount;
! int i;
/* see if the number of names is the same */
! if (fscanf(oldrefs, "%d", &oldcount) != 1 ||
oldcount != count) {
return(NO);
***************
*** 125,130 ****
/* see if the name list is the same */
for (i = 0; i < count; ++i) {
! matchcnt = fscanf(oldrefs,"%s\n",oldname);
! if ((! matchcnt) ||
strnotequal(oldname, names[i])) {
return(NO);
--- 125,129 ----
/* see if the name list is the same */
for (i = 0; i < count; ++i) {
! if ((1 != fscanf(oldrefs," %[^\n]",oldname)) ||
strnotequal(oldname, names[i])) {
return(NO);
***************
*** 307,314 ****
none have been changed up to the included files */
for (i = 0; i < nsrcfiles; ++i) {
! if (! fgets(oldname, sizeof(oldname), oldrefs) ||
! strnotequal(oldname, srcfiles[i]) ||
! lstat(srcfiles[i], &statstruct) != 0 ||
! statstruct.st_mtime > reftime) {
goto outofdate;
}
--- 306,314 ----
none have been changed up to the included files */
for (i = 0; i < nsrcfiles; ++i) {
! if ((1 != fscanf(oldrefs," %[^\n]",oldname))
! || strnotequal(oldname, srcfiles[i])
! || (lstat(srcfiles[i], &statstruct) != 0)
! || (statstruct.st_mtime > reftime)
! ) {
goto outofdate;
}
***************
*** 340,345 ****
oldfile = getoldfile();
} else { /* force cross-referencing of all the source files */
! force: reftime = 0;
! oldfile = NULL;
}
/* open the new cross-reference file */
--- 340,346 ----
oldfile = getoldfile();
} else { /* force cross-referencing of all the source files */
! force:
! reftime = 0;
! oldfile = NULL;
}
/* open the new cross-reference file */
|
|
From: Neil Horman <nhorman@us...> - 2008-03-12 00:58:24
|
Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3149/src
Modified Files:
build.c
Log Message:
Fix samelist() to properly absorb newlines in input stream
Index: build.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/build.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** build.c 20 Aug 2006 15:00:33 -0000 1.12
--- build.c 10 Mar 2008 18:33:47 -0000 1.13
***************
*** 116,123 ****
char oldname[PATHLEN + 1]; /* name in old cross-reference */
int oldcount;
! int i;
/* see if the number of names is the same */
! if (fscanf(oldrefs, "%d", &oldcount) != 1 ||
oldcount != count) {
return(NO);
--- 116,123 ----
char oldname[PATHLEN + 1]; /* name in old cross-reference */
int oldcount;
! int i, matchcnt;
/* see if the number of names is the same */
! if (fscanf(oldrefs, "%d\n", &oldcount) != 1 ||
oldcount != count) {
return(NO);
***************
*** 125,129 ****
/* see if the name list is the same */
for (i = 0; i < count; ++i) {
! if (! fgets(oldname, sizeof(oldname), oldrefs)||
strnotequal(oldname, names[i])) {
return(NO);
--- 125,130 ----
/* see if the name list is the same */
for (i = 0; i < count; ++i) {
! matchcnt = fscanf(oldrefs,"%s\n",oldname);
! if ((! matchcnt) ||
strnotequal(oldname, names[i])) {
return(NO);
|
|
From: Neil Horman <nhorman@us...> - 2008-03-12 00:58:24
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3149 Modified Files: ChangeLog Log Message: Fix samelist() to properly absorb newlines in input stream Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -r1.172 -r1.173 *** ChangeLog 14 Feb 2008 12:39:36 -0000 1.172 --- ChangeLog 10 Mar 2008 18:33:47 -0000 1.173 *************** *** 1,2 **** --- 1,6 ---- + 2008-03-10 Neil Horman <nhorman@...> + * src/build.c: Fix Samelist to properly absorb newlines + so that inverted indicies aren't always rebuilt + 2008-02-14 Neil Horman <nhorman@...> |