Merge branch 'gawk-4.1-stable'

16 files changed, 57 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e6fafcc..1ae66b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-17         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* ext.c (close_extensions): Test for null pointer since
+	since this can be called by signal handler before the
+	pointers are initialized.
+
 2014-10-15         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Make sane the handling of AWKPATH and AWKLIBPATH:
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index 6ef0bbde..13d6b090 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (stamp-eg): Use explicit ./extract.awk to avoid
+	assumptions about AWKPATH in the environment.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index 87ee96b8..c1d58780 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -66,7 +66,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
 	rm -fr eg && \
 	rm -fr stamp-eg && \
-	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	$(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
 	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
 	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
 
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 38124fad..cb8097bf 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -653,7 +653,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
 	rm -fr eg && \
 	rm -fr stamp-eg && \
-	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	$(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
 	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
 	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3cdba352..4b63a290 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Fix date in docbook attribution for new Foreword;
+	thanks to Antonio Columbo for the catch.  Update latest version
+	of gettext.
+
 2014-10-15         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawk.1: Fix default value for AWKLIBPATH.
diff --git a/doc/gawk.info b/doc/gawk.info
index fd79adb9..8ca1fba3 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -20567,8 +20567,8 @@ File: gawk.info,  Node: Gawk I18N,  Next: I18N Summary,  Prev: I18N Example,  Up
 `gawk' itself has been internationalized using the GNU `gettext'
 package.  (GNU `gettext' is described in complete detail in *note (GNU
 `gettext' utilities)Top:: gettext, GNU gettext tools.)  As of this
-writing, the latest version of GNU `gettext' is version 0.19.2
-(ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.2.tar.gz).
+writing, the latest version of GNU `gettext' is version 0.19.3
+(ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.3.tar.gz).
 
    If a translation of `gawk''s messages exists, then `gawk' produces
 usage messages, warnings, and fatal errors in the local language.
diff --git a/doc/gawk.texi b/doc/gawk.texi
index eca4b23d..f079ec9b 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -1228,7 +1228,7 @@ March, 2001
       <!-- can't put mawk into command tags. sigh. -->
       <affiliation><jobtitle>Author of mawk</jobtitle></affiliation>
     </author>
-    <date>March, 2001</date>
+    <date>October, 2014</date>
    </prefaceinfo>
 @end docbook
 
@@ -28844,8 +28844,8 @@ complete detail in
 @cite{GNU gettext tools}}.)
 @end ifnotinfo
 As of this writing, the latest version of GNU @command{gettext} is
-@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.2.tar.gz,
-@value{PVERSION} 0.19.2}.
+@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.3.tar.gz,
+@value{PVERSION} 0.19.3}.
 
 If a translation of @command{gawk}'s messages exists,
 then @command{gawk} produces usage messages, warnings,
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 88021c2f..227274ea 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -1223,7 +1223,7 @@ March, 2001
       <!-- can't put mawk into command tags. sigh. -->
       <affiliation><jobtitle>Author of mawk</jobtitle></affiliation>
     </author>
-    <date>March, 2001</date>
+    <date>October, 2014</date>
    </prefaceinfo>
 @end docbook
 
@@ -27954,8 +27954,8 @@ complete detail in
 @cite{GNU gettext tools}}.)
 @end ifnotinfo
 As of this writing, the latest version of GNU @command{gettext} is
-@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.2.tar.gz,
-@value{PVERSION} 0.19.2}.
+@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.3.tar.gz,
+@value{PVERSION} 0.19.3}.
 
 If a translation of @command{gawk}'s messages exists,
 then @command{gawk} produces usage messages, warnings,
diff --git a/ext.c b/ext.c
index afb8d715..cf813674 100644
--- a/ext.c
+++ b/ext.c
@@ -397,6 +397,9 @@ close_extensions()
 {
 	SRCFILE *s;
 
+	if (srcfiles == NULL)
+		return;
+
 	for (s = srcfiles->next; s != srcfiles; s = s->next) 
 		if (s->stype == SRC_EXTLIB && s->fini_func)
                	        (*s->fini_func)();
diff --git a/test/ChangeLog b/test/ChangeLog
index aa0ddcbe..a9386634 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (profile1, testext): Use explicit ./foo.awk to avoid
+	assumptions about AWKPATH in the environment.
+
 2014-10-12         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (charset-msg-start): Add a list of needed locales.
diff --git a/test/Makefile.am b/test/Makefile.am
index 81548186..aae27832 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1673,7 +1673,7 @@ profile1:
 	@echo $@
 	@$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1
 	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk
-	@$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
+	@$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \
 	cp "$(srcdir)"/dtdgport.awk $@.ok ; }
 	
@@ -1862,7 +1862,7 @@ inplace3::
 testext::
 	@echo $@
 	@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
-	@$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
 
 readdir:
diff --git a/test/Makefile.in b/test/Makefile.in
index 8d7790f4..9d264be2 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2098,7 +2098,7 @@ profile1:
 	@echo $@
 	@$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1
 	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk
-	@$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
+	@$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \
 	cp "$(srcdir)"/dtdgport.awk $@.ok ; }
 
@@ -2286,7 +2286,7 @@ inplace3::
 testext::
 	@echo $@
 	@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
-	@$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
 
 readdir:
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 9e055cf4..c7dd4233 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,14 @@
+2014-10-17         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* config_h.com: Use sys$disk: instead of prj_root: for
+	  copying the configure file.
+	* gawk_alias_setup.com: Fix removal of out of date aliases.
+	* vmsbuild.com: Fix a typo for symbol CNAME and a case sensitive
+	  test for "VAX" .eq. "vax" that failed.  Also disable verify
+	  while looking up the actual version.
+	* vmstest.com: Make sure that the test directory exists when
+	  using a search list.
+
 2014-04-18         John E. Malmberg      <wb8tyw@qsl.net>
 
 	* gawk_alias_setup.com: Fix problem with file links on Vax/VMS.
diff --git a/vms/config_h.com b/vms/config_h.com
index c1d3becf..0074a65a 100644
--- a/vms/config_h.com
+++ b/vms/config_h.com
@@ -104,7 +104,7 @@ $! On some platforms, DCL search has problems with searching a file
 $! on a NFS mounted volume.  So copy it to sys$scratch:
 $!
 $if f$search(configure_script) .nes. "" then delete 'configure_script';*
-$copy PRJ_ROOT:configure 'configure_script'
+$copy sys$disk:configure 'configure_script'
 $!
 $!
 $! Write out the header
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index c13e4b57..a46cc2ca 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -48,7 +48,7 @@ $   CFLAGS = "/Incl=[]/Obj=[]/Opt=noInline/Def=(''CDEFS')''CCFLAGS'"
 $   LIBS = "sys$share:vaxcrtl.exe/Shareable"
 $  else  !!VAXC
 $!  neither GNUC nor VAXC, assume DECC (same for either VAX or Alpha)
-$ if arch_name .eqs. "vax"
+$ if arch_name .eqs. "VAX"
 $ then
 $   CFLOAT = ""
 $ else
@@ -58,7 +58,7 @@ $   CC = "cc/DECC/Prefix=All"
 $   CNAME = "/NAME=(AS_IS,SHORT)
 $   CINC = "/NESTED_INCLUDE=NONE"
 $   CFLAGS = "/Incl=([],[.vms])/Obj=[]/Def=(''CDEFS')''CINC'''CCFLAGS'"
-$   CFLAGS = CNAMES + CFLOAT + CFLAGS 
+$   CFLAGS = CNAME + CFLOAT + CFLAGS
 $   LIBS = ""	! DECC$SHR instead of VAXCRTL, no special link option needed
 $  endif !VAXC
 $ endif !GNUC
@@ -147,8 +147,8 @@ psect_attr=environ,noshr	!extern [noshare] char **
 stack=48	!preallocate more pages (default is 20)
 iosegment=128	!ditto (default is 32)
 $!
-$ v1 = f$verify(1)
 $ @[.vms]gawk_ident.com
+$ v1 = f$verify(1)
 $ open/append Fopt gawk.opt
 $ write Fopt libs
 $ close Fopt
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 30bdbf22..a2ab9bff 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -27,6 +27,9 @@ $	gawk = "$sys$disk:[-]gawk"
 $	AWKPATH_srcdir = "define/User AWKPATH sys$disk:[]"
 $	AWKLIBPATH_dir = "define/User AWKLIBPATH sys$disk:[-]"
 $
+$!	Make sure that the default directory exists on a search list.
+$	def_dir = f$environment("default")
+$	create/dir 'def_dir'
 $	listdepth = 0
 $	pipeok = 0
 $	floatmode = -1	! 0: D_float, 1: G_float, 2: IEEE T_float