From: evans1629 Date: Sun, 20 Apr 2003 02:31:48 +0000 (+0000) Subject: Incorporated path for file inclusion in cpplib.c. X-Git-Tag: splint-3_1_0~14 X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/d767066b40ee6d1187273de11f2f942f8a10e1e7 Incorporated path for file inclusion in cpplib.c. Updated version number. --- diff --git a/configure b/configure index cce3ae0..a018478 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for Splint 3.0.1.8. +# Generated by GNU Autoconf 2.53 for Splint 3.1.0. # # Report bugs to . # @@ -256,8 +256,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Splint' PACKAGE_TARNAME='splint' -PACKAGE_VERSION='3.0.1.8' -PACKAGE_STRING='Splint 3.0.1.8' +PACKAGE_VERSION='3.1.0' +PACKAGE_STRING='Splint 3.1.0' PACKAGE_BUGREPORT='splint-bug@splint.org' ac_unique_file="src/lclinit.c" @@ -725,7 +725,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Splint 3.0.1.8 to adapt to many kinds of systems. +\`configure' configures Splint 3.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -792,7 +792,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Splint 3.0.1.8:";; + short | recursive ) echo "Configuration of Splint 3.1.0:";; esac cat <<\_ACEOF @@ -882,7 +882,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Splint configure 3.0.1.8 +Splint configure 3.1.0 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -897,7 +897,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Splint $as_me 3.0.1.8, which was +It was created by Splint $as_me 3.1.0, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1516,7 +1516,7 @@ fi # Define the identity of the package. PACKAGE=splint - VERSION=3.0.1.8 + VERSION=3.1.0 # Some tools Automake needs. @@ -3580,7 +3580,7 @@ _ACEOF # These used to be in herald.h -LCL_PARSE_VERSION="Splint 3.0.1.8" +LCL_PARSE_VERSION="Splint 3.1.0" cat >>confdefs.h <<_ACEOF #define SPLINT_VERSION "$LCL_PARSE_VERSION --- `date +"%d %b %Y"`" @@ -4014,7 +4014,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Splint $as_me 3.0.1.8, which was +This file was extended by Splint $as_me 3.1.0, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4076,7 +4076,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Splint config.status 3.0.1.8 +Splint config.status 3.1.0 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 5c03300..8c38219 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process with autoconf to create a configure script -*- Autoconf -*- AC_PREREQ(2.50) -AC_INIT([Splint], [3.0.1.8], [splint-bug@splint.org], [splint]) +AC_INIT([Splint], [3.1.0], [splint-bug@splint.org], [splint]) dnl This MUST precede any other macro AC_CONFIG_AUX_DIR([config]) diff --git a/doc/manual.doc b/doc/manual.doc index 8b4b3b1..0600def 100644 Binary files a/doc/manual.doc and b/doc/manual.doc differ diff --git a/src/cpplib.c b/src/cpplib.c index 82bbdd6..40ac023 100644 --- a/src/cpplib.c +++ b/src/cpplib.c @@ -8451,8 +8451,27 @@ static bool cpp_skipIncludeFile (cstring fname) if (context_getFlag (FLG_SKIPSYSHEADERS)) { - DPRINTF (("Skip include TRUE: %s", fname)); - return TRUE; + /* + ** 2003-04-18: Patch from Randal Parsons + */ + + /* + ** Don't skip include file unless the file actually exists. + ** It may be in a different directory. + */ + + int f = open (cstring_toCharsSafe (fname), O_RDONLY, 0666); + + if (f >= 0) + { + check (close (f) == 0); + DPRINTF (("Skip include TRUE: %s", fname)); + return TRUE; + } + else + { + /* Keep looking... */ + } } } diff --git a/src/fileTable.c b/src/fileTable.c index 0fe22bf..46722ba 100644 --- a/src/fileTable.c +++ b/src/fileTable.c @@ -828,7 +828,7 @@ fileTable_cleanup (fileTable ft) } else if (fileId_isValid (fe->fder)) { - /*@i423 this should use close (fd) also... */ + /* this should use close (fd) also... */ (void) osd_unlink (fe->fname); } else if (fe->ftype == FILE_MACROS)