Merge branch 'gawk-4.1-stable'

6 files changed, 71 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index f6a532b2..4dd9084e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* NEWS: Document VMS support updated.
+
 2016-01-24         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Regex: treat [x] as x if x is a unibyte encoding error.
diff --git a/NEWS b/NEWS
index eeb5014c..8383b805 100644
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,8 @@ Changes from 4.1.3 to 4.1.x
 
 5. AIX 7.1 should pass the test suite now.  Similar for Minix.
 
+6. VMS support has been updated.
+
 Changes from 4.1.2 to 4.1.3
 ---------------------------
 
diff --git a/README_d/ChangeLog b/README_d/ChangeLog
index 09743da9..f61846ec 100644
--- a/README_d/ChangeLog
+++ b/README_d/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* README.zLinux: New file.
+
 2015-05-19         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.3: Release tar ball made.
diff --git a/README_d/README.zLinux b/README_d/README.zLinux
new file mode 100644
index 00000000..2ff18fff
--- /dev/null
+++ b/README_d/README.zLinux
@@ -0,0 +1,16 @@
+Mon Jan 25 18:45:06 IST 2016
+============================
+
+For z/Linux (CentOS 4, at least), you must fix the optimization level
+before compiling:
+
+1. Run configure.
+2. Edit the top-level Makefile and extension/Makefile and change -O2 to -O1.
+3. Run `make && make' check as usual.
+
+If you don't change the optimization level, the testext test will fail.
+
+In any case, expect the fmtspcl test to fail.
+
+Arnold Robbins
+arnold@skeeve.com
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 8113c520..bd1f24f8 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,11 +1,21 @@
 2016-01-24         John E. Malmberg      <wb8tyw@qsl.net>
-        * generate_config_vms_h_gawk.com: supress compiler message
-          about comparing an unsigned value t to be a negative number
-          in w.missing_d/strftime.c.
-        * descrip.mms: Temporary comment out the use of bison or yacc
-          until current ports are known to be available for VMS.
-        * build_gawk_pcsi_desc.com: Remove extra copy of a file being
-          installed.
+
+	* vmstest.com: updates
+	(ofmta): Skip on VAX as VAX floating runtime is different.
+	(beginfile1): Handle NFS ODS-2 case encoded filenames.
+	(dumpvars): Fix test compare.
+	(gensub2): Capture stderr output for compare.
+	(define_gawklocale): set LC_ALL "utf8-20".
+
+2016-01-24         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* generate_config_vms_h_gawk.com: Supress compiler message
+	  about comparing an unsigned value to a negative number
+	  in w.missing_d/strftime.c.
+	* descrip.mms: Temporary comment out the use of bison or yacc
+	  until current ports are known to be available for VMS.
+	* build_gawk_pcsi_desc.com: Remove extra copy of a file being
+	  installed.
 
 2016-01-21         John E. Malmberg      <wb8tyw@qsl.net>
 
diff --git a/vms/vmstest.com b/vms/vmstest.com
index a2ab9bff..980f899e 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -26,6 +26,7 @@ $	mv	= "rename/New_Vers"
 $	gawk = "$sys$disk:[-]gawk"
 $	AWKPATH_srcdir = "define/User AWKPATH sys$disk:[]"
 $	AWKLIBPATH_dir = "define/User AWKLIBPATH sys$disk:[-]"
+$	arch_name = f$edit(f$getsyi("arch_name"),"upcase,trim")
 $
 $!	Make sure that the default directory exists on a search list.
 $	def_dir = f$environment("default")
@@ -292,6 +293,12 @@ $	if $status then  rm _'test'.tmp;
 $	return
 $
 $! more common tests, without a data file: gawk -f 'test'.awk
+$ofmta:
+$  	if arch_name .eqs. "VAX"
+$	then
+$	    echo "''test' skipped on VAX."
+$	    return
+$	endif
 $aarray1:
 $aasort:
 $aasorti:
@@ -329,7 +336,6 @@ $negrange:
 $nlstrina:
 $nondec:
 $octsub:
-$ofmta:
 $paramtyp:
 $paramuninitglobal:
 $patsplit:
@@ -354,7 +360,7 @@ $zero2:
 $zeroflag:
 $! common without 'test'.in
 $	echo "''test'"
-$	gawk -f 'test'.awk >_'test'.tmp
+$	gawk -f 'test'.awk 2>&1 >_'test'.tmp
 $	cmp 'test'.ok sys$disk:[]_'test'.tmp
 $	if $status then  rm _'test'.tmp;
 $	return
@@ -1604,7 +1610,7 @@ $
 $mbstr1:	echo "mbstr1"
 $	gosub define_gawklocale
 $	AWKPATH_srcdir
-$	gawk -f mbstr1.awk >_mbstr1.tmp
+$	gawk -f mbstr1.awk 2>&1 >_mbstr1.tmp
 $	cmp mbstr1.ok sys$disk:[]_mbstr1.tmp
 $	if $status then  rm _mbstr1.tmp;
 $	return
@@ -1657,11 +1663,22 @@ $	!  "no/such/file" yields syntax error rather than no such file
 $	!  when subdirectories no/ and no/such/ don't exist;
 $	!  vms test suite doesn't generate Makefile;
 $	!  "is a directory" and "no such file" aren't capitalized
-$	! gawk -f beginfile1.awk beginfile1.awk . ./no/such/file "Makefile" >_beginfile1.tmp 2>&1
-$	gawk -f beginfile1.awk beginfile1.awk [] ./no-such-file "Makefile.in" >_beginfile1.tmp 2>&1
-$	gawk -f - _beginfile1.tmp >_beginfile1.too
+$	! gawk -f beginfile1.awk beginfile1.awk . -
+$	!   ./no/such/file "Makefile" >_beginfile1.tmp 2>&1
+$	! And NFS on ODS2 encodes the case in the filename with
+$	! the $ character switching case.
+$	makefile_in = "Makefile.in"
+$	makefile_in_nfs_ods2 = "$M$akefile.in"
+$	if f$search(makefile_in_nfs_ods2) .nes. ""
+$	then
+$	    makefile_in = makefile_in_nfs_ods2
+$	endif
+$	gawk -f beginfile1.awk beginfile1.awk [] -
+	 ./no-such-file "''makefile_in'" >_beginfile1.tmp 2>&1
+$	    gawk -f - _beginfile1.tmp >_beginfile1.too
 { if (gsub("\\[\\]",".")) gsub("no such file or directory","is a directory")
-  gsub("no-such-file","file"); gsub("Makefile.in","Makefile"); print }
+  gsub("no-such-file","file"); gsub("Makefile.in","Makefile");
+  gsub("\\$M\\$akefile.in","Makefile"); print }
 $	rm _beginfile1.tmp;
 $	mv _beginfile1.too _beginfile1.tmp
 $	igncascmp beginfile1.ok sys$disk:[]_beginfile1.tmp
@@ -1671,6 +1688,9 @@ $
 $dumpvars: echo "dumpvars"
 $	gawk --dump-variables 1 <dumpvars.in >_NL: 2>&1
 $	mv awkvars.out _dumpvars.tmp
+$	gawk "!/ENVIRON|PROCINFO/" _dumpvars.tmp >_dumpvars.tmp1
+$	rm sys$disk:[]_dumpvars.tmp;*
+$	mv sys$disk:[]_dumpvars.tmp1 sys$disk:[]_dumpvars.tmp
 $	cmp dumpvars.ok sys$disk:[]_dumpvars.tmp
 $	if $status then  rm _dumpvars.tmp;
 $	return
@@ -1952,16 +1972,7 @@ $
 $! assign temporary value to logical name GAWKLOCALE unless it already has one
 $! [ -z "$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8
 $define_gawklocale:
-$	! gawk uses the C run-time libary's getenv() function to look up
-$	! GAWKLOCALE, so a symbol provides another way to supply the value;
-$	! we don't want to override logical or symbol if either is present
-$	if f$trnlnm("GAWKLOCALE").eqs.""
-$	then
-$	    if f$type(gawklocale).nes."STRING" .or. "''gawklocale'".eqs.""
-$	    then
-$		define/User GAWKLOCALE "en_US.UTF-8"
-$	    endif
-$	endif
+$	define/user LC_ALL "utf8-20"
 $	return
 $
 $! make sure that the specified file's longest-record-length field is set;