Move to 3.1.8.

6 files changed, 81 insertions, 29 deletions

diff --git a/vms/ChangeLog b/vms/ChangeLog
index 4612fe79..fcb60064 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,32 @@
+Thu May  6 20:55:14 2010  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.8: Release tar file made.
+
+Tue Apr 20 14:54:03 2010  Pat Rankin  <rankin@pactechdata.com>
+
+	* vms-conf.h (HAVE_LIBSIGSEGV): Add placeholder; leave undefined.
+	* vmstest.com (manyfiles): keep going even if gawk fails.
+
+Thu Apr  1 14:04:17 2010  Pat Rankin  <rankin@pactechdata.com>
+
+	* vmstest.com (uninit5): fix typo in test name.
+
+Mon Mar 29 16:26:39 2010  Pat Rankin  <rankin@pactechdata.com>
+
+	* vms-conf.h (HAVE_USLEEP): define.
+	* vmstest.com (fcall_exit, fcall_exit2, forref, uninit5): new tests.
+	* descrip.mms (builtin.obj): add floatmagic.h dependency.
+
+Mon Mar  8 15:17:41 2010  Pat Rankin  <rankin@pactechdata.com>
+
+	* vmstest.com (space): handle alternate error reason.
+	(fmtspcl): suppress this test.
+
+Wed Mar  3 16:29:10 2010  Pat Rankin  <rankin@pactechdata.com>
+
+	* vms-conf.h: sync with configh.in; reformat a couple of comments.
+	(PACKAGE_URL): add #undef as placeholder.
+
 Tue Jul 21 22:28:56 2009  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.7: Release tar file made.
@@ -10,7 +39,7 @@ Wed Jul  8 18:59:22 2009  Pat Rankin  <rankin@pactechdata.com>
 	(lc_num1, mbfw1, mbprintf1, rsstart3): Skip these failing tests.
 	(double1, double2): Likewise.
 
-Mon Jun 22 00:51:17 2009  Pat Ranin  <rankin@pactechdata.com>
+Mon Jun 22 00:51:17 2009  Pat Rankin  <rankin@pactechdata.com>
 
 	* vms_misc.c (vms_open): Explicitly specify "rat=cr" to force
 	carriage-return-carraige-control record attribute along with
@@ -238,7 +267,7 @@ Wed Apr 17 15:57:30 2002  Pat Rankin  <rankin@eql.caltech.edu>
 
 Sat Dec 22 19:18:31 2001  Pat Rankin  <rankin@eql.caltech.edu>
 
-        * redirect.h (tzset):  Declare.
+	* redirect.h (tzset):  Declare.
 
 Sun Jun  3 13:04:44 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -264,7 +293,7 @@ Thu Apr 12 18:29:50 2001  Pat Rankin  <rankin@eql.caltech.edu>
 Thu Apr  5 20:31:22 2001  Pat Rankin  <rankin@eql.caltech.edu>
 
 	* vms-conf.h: synchronize with current configh.in.
-          [NO_ALLOCA]: define instead of C_ALLOCA.
+	  [NO_ALLOCA]: define instead of C_ALLOCA.
 	* redirect.h (strcoll): substitute strcmp for VAXCRTL config.
 	  (struct timeval): define.
 	  (gettimeofday): substitute vms_gettimeofday; declare.
@@ -276,7 +305,7 @@ Thu Apr  5 20:31:22 2001  Pat Rankin  <rankin@eql.caltech.edu>
 
 Sun Jan 28 15:50:02 2001  Eli Zaretskii  <eliz@is.elta.co.il>
 
-	* gawkmisc.vms (os_restore_mode): New function
+	* gawkmisc.vms (os_restore_mode): New function.
 
 Sun Dec  3 16:53:37 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -286,7 +315,7 @@ Tue Nov  7 14:09:14 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* gawkmisc.vms (os_is_setuid): new function.
 
-Wed Jul 30 19:53:52 1997  Arnold D. Robbins  <arnold@gnu.ai.mit.edu>
+Wed Jul 30 19:53:52 1997  Arnold D. Robbins  <arnold@gnu.org>
 
 	* Close-on-exec changes:
 	  gawkmisc.vms: (os_close_on_exec, os_isdir): new functions.
diff --git a/vms/descrip.mms b/vms/descrip.mms
index c89f6c00..a3abd14b 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -128,7 +128,7 @@ DOCS= $(DOCDIR)gawk.1,$(DOCDIR)gawk.texi,$(DOCDIR)texinfo.tex
 
 # Release of gawk
 REL=3.1
-PATCHLVL=7
+PATCHLVL=8
 
 # generic target
 all : gawk,pgawk
@@ -191,7 +191,7 @@ $(AWKOBJS)	: awk.h gettext.h mbsupport.h regex.h dfa.h \
 $(GAWKOBJ)	: awk.h config.h $(VMSDIR)redirect.h
 $(PGAWKOBJ)	: awk.h config.h $(VMSDIR)redirect.h
 random.obj	: random.h
-builtin.obj	: random.h
+builtin.obj	: floatmagic.h random.h
 awkgram.obj	: awkgram.c awk.h
 dfa.obj	: dfa.c dfa.h
 regex.obj : regex.c regcomp.c regex_internal.c regexec.c regex.h regex_internal.h
diff --git a/vms/redirect.h b/vms/redirect.h
index 86de42f6..f6df0f65 100644
--- a/vms/redirect.h
+++ b/vms/redirect.h
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 88, 89, 91-93, 1996, 1997, 2007
+ * Copyright (C) 1986, 1988, 1989, 1991-1993, 1996, 1997, 2007, 2010
  * the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
diff --git a/vms/vms-conf.h b/vms/vms-conf.h
index 029fb4f2..079cc506 100644
--- a/vms/vms-conf.h
+++ b/vms/vms-conf.h
@@ -7,7 +7,7 @@
  */
 
 /* 
- * Copyright (C) 1991-1992, 1995-1996, 1999, 2001, 2002, 2003, 2005, 2009
+ * Copyright (C) 1991-1992, 1995-1996, 1999, 2001-2003, 2005, 2009, 2010
  * the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
@@ -148,6 +148,9 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
+/* Define if you have the sigsegv library. */
+#undef HAVE_LIBSIGSEGV
+
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
@@ -270,10 +273,10 @@
 /* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
@@ -344,6 +347,9 @@
 /* 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 `usleep' function. */
+#define HAVE_USLEEP 1
+
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
@@ -384,13 +390,16 @@
 #define PACKAGE_NAME "GNU Awk"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 3.1.7"
+#define PACKAGE_STRING "GNU Awk 3.1.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gawk"
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.1.7"
+#define PACKAGE_VERSION "3.1.8"
 
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
@@ -426,7 +435,7 @@
 #define USE_INCLUDED_STRFTIME 1
 
 /* Version number of package */
-#define VERSION "3.1.6"
+#define VERSION "3.1.8"
 
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
@@ -493,8 +502,9 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef pid_t
 
-/* Define to equivalent of C99 restrict keyword, or to nothing if this is not
-   supported. Do not define if restrict is supported directly. */
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
 #define restrict
 #if defined(__DECC) && (__DECC_VER >= 60400000)
 #undef restrict
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index c9402b12..c56f1a8d 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -10,7 +10,7 @@ $!						gawk 3.1.1 revised, Apr'02
 $!						gawk 3.1.6 revised, Mar'07
 $!
 $ REL = "3.1"	!release version number
-$ PATCHLVL = "7"
+$ PATCHLVL = "8"
 $!
 $!
 $ CCFLAGS = "/noList"	! "/noOpt/Debug"
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 3c1e75d7..c6c03e4e 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -44,9 +44,9 @@ $		list = "msg addcomma anchgsub argarray arrayparm arrayref" -
 $		gosub list_of_tests
 $		list = "concat2 concat3 concat4 convfmt datanonl defref" -
 		  + " delarprm delarpm2 delfunc dynlj eofsplit exitval1" -
-		  + " exitval2 fldchg fldchgnf fnamedat" -
-		  + " fnarray fnarray2 fnaryscl fnasgnm fnmisc" -
-		  + " fordel forsimp fsbs fsspcoln fsrs fstabplus" -
+		  + " exitval2 fcall_exit fcall_exit2 fldchg fldchgnf" -
+		  + " fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc" -
+		  + " fordel forref forsimp fsbs fsspcoln fsrs fstabplus" -
 		  + " funsemnl funsmnam funstack getline getline2 getline3"
 $		gosub list_of_tests
 $		list = "getlnbuf getnr2tb getnr2tm gsubasgn gsubtest" -
@@ -71,9 +71,10 @@ $		list = "prt1eval prtoeval psx96sub rand rebt8b1" -
 		  + " strcat1 strtod strnum1 subamp subi18n"
 $		gosub list_of_tests
 $		list = "subsepnm subslash substr swaplns synerr1 synerr2" -
-		  + " tradanch tweakfld uninit2 uninit3 uninit4 uninitialized" -
-		  + " unterm uparrfs wideidx wideidx2 widesub widesub2" -
-		  + " widesub3 widesub4 wjposer1 zeroe0 zeroflag zero2"
+		  + " tradanch tweakfld uninit2 uninit3 uninit4 uninit5" -
+		  + " uninitialized unterm uparrfs wideidx wideidx2" -
+		  + " widesub widesub2 widesub3 widesub4 wjposer1 zeroe0" -
+		  + " zeroflag zero2"
 $		gosub list_of_tests
 $		return
 $
@@ -258,6 +259,7 @@ $!!double2:
 $dynlj:
 $fnarydel:
 $fnparydl:
+$forref:
 $forsimp:
 $funsemnl:
 $gensub2:
@@ -319,7 +321,7 @@ $	gawk -f printlang.awk
 $	return
 $
 $poundbang:
-$	echo "poundbang:  not supported"
+$	echo "poundbang: not supported"
 $	return
 $
 $messages:	echo "messages"
@@ -401,7 +403,9 @@ $	if f$search("[.junk]*.*").nes."" then  rm [.junk]*.*;*
 $	if f$parse("[.junk]").eqs."" then  create/Dir/Prot=(O:rwed) [.junk]
 $	gawk -- "BEGIN {for (i = 1; i <= ''f_cnt'; i++) print i, i}" >_manyfiles.dat
 $	echo "(processing ''f_cnt' files; this may take quite a while)"
+$	set noOn	! continue even if gawk fails
 $	gawk -f manyfiles.awk _manyfiles.dat _manyfiles.dat
+$	set On
 $	define/User sys$error _NL:
 $	define/User sys$output _manyfiles.tmp
 $	search/Match=Nor/Output=_NL:/Log [.junk]*.* ""
@@ -932,6 +936,7 @@ $	cmp exitval2.ok _exitval2.tmp
 $	if $status then  rm _exitval2.tmp;
 $	return
 $
+$fcall_exit2:
 $fnarray2:
 $fnmisc:
 $gsubasgn:
@@ -984,6 +989,7 @@ $	cmp rstest5.ok _rstest5.tmp
 $	if $status then  rm _rstest5.tmp;
 $	return
 $
+$fcall_exit:
 $synerr1:
 $synerr2:
 $	echo "''test'"
@@ -998,6 +1004,7 @@ $
 $uninit2:
 $uninit3:
 $uninit4:
+$uninit5:
 $uninitialized:
 $	echo "''test'"
 $	gawk --lint -f 'test'.awk 'test'.in >_'test'.tmp 2>&1
@@ -1010,7 +1017,11 @@ $	set noOn
 $	gawk -f " " space.awk >_space.tmp 2>&1
 $	if .not.$status then call exit_code 2 _space.tmp
 $	set On
-$!	space.ok expects "No such file...", we see "no such file..."
+$!	we get a different error from what space.ok expects
+$	gawk "{gsub(""file specification syntax error"", ""no such file or directory""); print}" -
+		_space.tmp >_space.too
+$	rm _space.tmp;
+$	mv _space.too _space.tmp
 $	igncascmp space.ok _space.tmp
 $	if $status then  rm _space.tmp;
 $	return
@@ -1299,13 +1310,15 @@ $	cmp printfbad2.ok _printfbad2.tmp
 $	if $status then  rm _printfbad2.tmp;
 $	return
 $
-$fmtspcl:
-$! fmtspcl only works if gawk was compiled to use IEEE floating point
+$fmtspcl:	echo "fmtspcl: not supported"
+$	return
+$!!fmtspcl:
+$! fmtspcl ought to work if gawk was compiled to use IEEE floating point
 $	if floatmode.lt.0 then  gosub calc_floatmode
 $	if floatmode.lt.2
-$	then	echo "fmtspcl:  not supported"
+$	then	echo "fmtspcl: not supported"
 $	else	echo "fmtspcl"
-$		gawk -f fmtspcl.awk >_fmtspcl.tmp
+$		gawk -f fmtspcl.awk >_fmtspcl.tmp 2>&1
 $		cmp fmtspcl.ok _fmtspcl.tmp
 $		if $status then  rm _fmtspcl.tmp;
 $	endif