binaryfixscript = ./fixBinaryDist.sh
SUBDIRS = lib imports test doc src
+binaryDir = bin
+binaryDirFiles = $(binaryDir)/Makefile.am $(binaryDir)/Makefile.in
+
binaryBuiltFiles = Makefile.binary.am configure.binary.ac
+
#include these in case we're trying to build on a systems
#without the bleeding edge versions of automake and autoconf
binaryDerivedFiles = Makefile.binary.in configure.binary
-EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) preBuilt/Makefile.am preBuilt/Makefile.in
+#try to remake these but don't stop if it fails.
+configure.binary:configure.binary.ac
+ -autoconf -oconfigure.binary configure.binary.ac
+
+Makefile.binary.in:Makefile.binary.am
+ -automake Makefile.binary
+
+$(binaryDir)/Makefile.in: $(binaryDir)/Makefile.am
+ -automake $(binaryDir)/Makefile
+
+EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) $(binaryDirFiles)
+
+preDist: $(binaryDir)/Makefile.in $(binaryDerivedFiles)
-bindist:
+bindist: $(binaryDerivedFiles)
$(MAKE)
- $(CP) src/splint preBuilt/splint
- $(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="preBuilt lib imports doc"
+ $(RM) -f $(binaryDir)/splint
+ $(CP) src/splint $(binaryDir)/splint
+ $(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="$(binaryDir) lib imports doc"
+ $(MV) $(distdir).tar.gz $(distdir).`uname`.tgz
dist-hook:
cd $(distdir); pwd; $(dh_script)
AUTOMAKE_OPTIONS = 1.5 foreign
-SUBDIRS = preBuilt lib imports doc
+binaryDir = bin
+
+SUBDIRS = $(binaryDir) lib imports doc
+
+all: config.h src/splint
+
+src/splint: $(binaryDir)/splint
+ ln -s ../$(binaryDir)/splint src/splint
AUTOMAKE_OPTIONS = 1.5 foreign
-SUBDIRS = preBuilt lib imports doc
+binaryDir = bin
+
+SUBDIRS = $(binaryDir) lib imports doc
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
uninstall uninstall-am uninstall-info-am \
uninstall-info-recursive uninstall-recursive
+
+all: config.h src/splint
+
+src/splint: $(binaryDir)/splint
+ ln -s ../$(binaryDir)/splint src/splint
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
binaryfixscript = ./fixBinaryDist.sh
SUBDIRS = lib imports test doc src
+binaryDir = bin
+binaryDirFiles = $(binaryDir)/Makefile.am $(binaryDir)/Makefile.in
+
binaryBuiltFiles = Makefile.binary.am configure.binary.ac
+
#include these in case we're trying to build on a systems
#without the bleeding edge versions of automake and autoconf
binaryDerivedFiles = Makefile.binary.in configure.binary
-EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) preBuilt/Makefile.am preBuilt/Makefile.in
+EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) $(binaryDirFiles)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = preBuilt/Makefile
+CONFIG_CLEAN_FILES =
DIST_SOURCES =
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
uninstall-info-recursive all-recursive install-data-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ./stamp-h.in Makefile.am Makefile.in acinclude.m4 \
- aclocal.m4 config.hin config/config.guess config/config.sub \
- config/depcomp config/install-sh config/missing \
- config/mkinstalldirs configure configure.ac
+DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
+ acinclude.m4 aclocal.m4 config.hin config/config.guess \
+ config/config.sub config/depcomp config/install-sh \
+ config/missing config/mkinstalldirs configure configure.ac
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
distclean-hdr:
-rm -f config.h
-preBuilt/Makefile: $(top_builddir)/config.status $(top_srcdir)/preBuilt/Makefile.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
distdir: $(DISTFILES)
-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/config $(distdir)/preBuilt
+ $(mkinstalldirs) $(distdir)/$(binaryDir) $(distdir)/config
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
uninstall-info-recursive uninstall-recursive
-bindist:
+#try to remake these but don't stop if it fails.
+configure.binary:configure.binary.ac
+ -autoconf -oconfigure.binary configure.binary.ac
+
+Makefile.binary.in:Makefile.binary.am
+ -automake Makefile.binary
+
+$(binaryDir)/Makefile.in: $(binaryDir)/Makefile.am
+ -automake $(binaryDir)/Makefile
+
+preDist: $(binaryDir)/Makefile.in $(binaryDerivedFiles)
+
+bindist: $(binaryDerivedFiles)
$(MAKE)
- $(CP) src/splint preBuilt/splint
- $(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="preBuilt lib imports doc"
+ $(RM) -f $(binaryDir)/splint
+ $(CP) src/splint $(binaryDir)/splint
+ $(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="$(binaryDir) lib imports doc"
+ $(MV) $(distdir).tar.gz $(distdir).`uname`.tgz
dist-hook:
cd $(distdir); pwd; $(dh_script)
#define TARGET_OS "${target_os}"
EOF
-ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile src/Makefile test/Makefile doc/Makefile preBuilt/Makefile"
+ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile src/Makefile test/Makefile doc/Makefile bin/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "preBuilt/Makefile" ) CONFIG_FILES="$CONFIG_FILES preBuilt/Makefile" ;;
+ "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
*) { { echo "$as_me:3506: error: invalid argument: $ac_config_target" >&5
dnl Process with autoconf to create a configure script -*- Autoconf -*-
AC_PREREQ(2.50)
+
AC_INIT([Splint], [3.0.1.4], [splint-bug@splint.org], [splint])
dnl This MUST precede any other macro
dnl test/db1/Makefile])
AC_CONFIG_FILES([Makefile imports/Makefile lib/Makefile src/Makefile
- test/Makefile doc/Makefile preBuilt/Makefile])
+ test/Makefile doc/Makefile bin/Makefile])
AC_OUTPUT
#define TARGET_OS "${target_os}"
EOF
-ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile doc/Makefile preBuilt/Makefile"
+ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile doc/Makefile bin/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
"imports/Makefile" ) CONFIG_FILES="$CONFIG_FILES imports/Makefile" ;;
"lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "preBuilt/Makefile" ) CONFIG_FILES="$CONFIG_FILES preBuilt/Makefile" ;;
+ "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
*) { { echo "$as_me:3504: error: invalid argument: $ac_config_target" >&5
dnl test/db1/Makefile])
AC_CONFIG_FILES([Makefile imports/Makefile lib/Makefile
- doc/Makefile preBuilt/Makefile])
+ doc/Makefile bin/Makefile])
AC_OUTPUT
#run these if possible...
autoconf
automake
-mkdir src
-ln -s ../preBuilt/splint src/splint
+mkdir src || echo "COULD NOT MAKE src tar ball may be incorrect"
+echo "Created this file because some versions of tar are too simple include this directory without it" > src/dummy
+
+# Need to do this in the makefile because the tar command in make dist wants to derefence symlinks
+#ln -s ../bin/splint src/splint
# define LIBRARY_MARKER ";;; Splint Library "
/*@constant int MAX_NAME_LENGTH=256; @*/
-# define MAX_NAME_LENGTH 256
+# define MAX_NAME_LENGTH 1024
/*@constant int MAX_LINE_LENGTH=1024; @*/
# define MAX_LINE_LENGTH 1024
ALLSRC = $(GRAMSRC) $(COMMONSRC) $(SPLINTSRC) $(DER_FILES) $(HEADERSRC)
#files to run Splint on
-LINTSRC = $(COMMONSRC) $(SPLINTSRC)
+LINTSRC = $(COMMONSRC) $(SPLINTSRC)
#ALLSRC = $(COMMONSRC) $(SPLINTSRC) $(DER_FILES) $(HEADERSRC)
lintbuffercheck:
./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude $(LINTSRC) $(LCLSRC) -dump lclint \
+forcehints -misplacedsharequal +showsourceloc -unrecogcomments \
- -supcounts -fcnuse -exportlocal -constuse -mts file -mts filerw +arraybounds +arrayboundsread +implictconstraint -dLINTBUFFERCHECK
+ -supcounts -fcnuse -exportlocal -constuse -mts file -mts filerw +bounds +boundsread +implictconstraint -dLINTBUFFERCHECK
+binDir = bin
-all: splint$(EXEEXT)
+all: splint$(EXEEXT) ../$(top_builddir)/$(binDir)/splint$(EXEEXT)
+
+../$(top_builddir)/$(binDir)/splint$(EXEEXT): splint$(EXEEXT)
+ -$(RM) -f $(top_builddir)/$(binDir)/splint$(EXEEXT)
+ ln -s $(top_builddir)/src/splint$(EXEEXT) $(top_builddir)/$(binDir)/splint$(EXEEXT)
up:
-rm cgrammar.c llgrammar.c mtgrammar.c signature.c cscanner.c
$(MAKE) clean
-CLEANFILES = splint$(EXEEXT)
+CLEANFILES = splint$(EXEEXT) ../$(top_builddir)/$(binDir)/splint$(EXEEXT)
.c.o:
@echo "Compiling "$<"..."; \
ALLSRC = $(GRAMSRC) $(COMMONSRC) $(SPLINTSRC) $(DER_FILES) $(HEADERSRC)
#files to run Splint on
-LINTSRC = $(COMMONSRC) $(SPLINTSRC)
+LINTSRC = $(COMMONSRC) $(SPLINTSRC)
#ALLSRC = $(COMMONSRC) $(SPLINTSRC) $(DER_FILES) $(HEADERSRC)
CHECKS = $(subst .c,.check,$(splint_SOURCES))
-CLEANFILES = splint$(EXEEXT)
+binDir = bin
+
+CLEANFILES = splint$(EXEEXT) ../$(top_builddir)/$(binDir)/splint$(EXEEXT)
subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(lcl_SOURCES) $(splint_SOURCES)
-DIST_COMMON = ChangeLog Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in
SOURCES = $(lcl_SOURCES) $(splint_SOURCES)
all: $(BUILT_SOURCES)
lintbuffercheck:
./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude $(LINTSRC) $(LCLSRC) -dump lclint \
+forcehints -misplacedsharequal +showsourceloc -unrecogcomments \
- -supcounts -fcnuse -exportlocal -constuse -mts file -mts filerw +arraybounds +arrayboundsread +implictconstraint -dLINTBUFFERCHECK
+ -supcounts -fcnuse -exportlocal -constuse -mts file -mts filerw +bounds +boundsread +implictconstraint -dLINTBUFFERCHECK
+
+all: splint$(EXEEXT) ../$(top_builddir)/$(binDir)/splint$(EXEEXT)
-all: splint$(EXEEXT)
+../$(top_builddir)/$(binDir)/splint$(EXEEXT): splint$(EXEEXT)
+ -$(RM) -f $(top_builddir)/$(binDir)/splint$(EXEEXT)
+ ln -s $(top_builddir)/src/splint$(EXEEXT) $(top_builddir)/$(binDir)/splint$(EXEEXT)
up:
-rm cgrammar.c llgrammar.c mtgrammar.c signature.c cscanner.c
char c;
char *ol;
cstring olc;
-
- strcpy (l, yyt + 1);
- /* Need to safe original l for deallocating. */
- ol = l;
+ int len_yyt;
+
+ len_yyt = strlen (yyt +1) ;
- l += strlen (yyt) - 1;
+ l = mstring_copy (yyt + 1);
while ((c = char_fromInt (lminput ())) != '\n' && c != '\0')
{
- *l++ = c;
+ l = mstring_append(l, c);
}
- *l = '\0';
+ /* Need to safe original l for deallocating. */
+ ol = l;
+
+ l += strlen (l);
+
olc = cstring_fromChars (ol);
if (cstring_equalPrefixLit (olc, "pragma"))
/*@-retvalother@*/
/*drl added 11/27/2001*/
-/*@-arraybounds@*/
-/*@-arrayboundsread@*/
# ifdef __LCLINT__
/*@=redecl@*/
/*@=retvalother@*/
-
-/*drl added 11/27/2001*/
-/*@=arraybounds@*/
-/*@=arrayboundsread@*/
-
# ifdef OSF
# define __GNUC__
# endif
OBJEXT = o
PACKAGE = splint
RM = rm
-VERSION = 3.0.1.2
+VERSION = 3.0.1.4
am__include = include
am__quote =
install_sh = /net/af9/drl7x/reTmp/LCLintDev/config/install-sh
UNITTESTS = \
help \
abstptr abstract alias alttypes ansireserved argorder \
- args blocks break cases cast charlit clauses commentchar compdestroy \
+ args arraydims blocks break cases cast charlit clauses commentchar compdestroy \
constannot controldepth csyntax czechnames czechoslovaknames deadparam \
decl enum exports external fields flags forbody format freearray \
funcpointer functionmacro glob globals impabstract info init inparam internal iter keep libs \
args:
-$(SPLINTR) args -noeffect -expect 12
+.PHONY: arraydims
+arraydims:
+ -$(SPLINTR) arraydims.c -varuse -expect 2
+ -$(SPLINTR) arraydims.c -initsize -varuse
+
.PHONY: blocks
blocks:
-$(SPLINTR) blocks.c -expect 4
;;; Splint Library null6.lcd
-;;Splint 3.0.1.2 --- 14 Jan 2002
+;;Splint 3.0.1.4 --- 17 Jan 2002
;;lib:298
;;ctTable
0 u-2 19 38
;;; Splint Library newlint.lcd
-;;Splint 3.0.1.2 --- 14 Jan 2002
+;;Splint 3.0.1.4 --- 17 Jan 2002
;;lib:298
;;ctTable
0 u-2 19 38