Merge branch 'master' into feature/cmake

11 files changed, 42 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 4dd9084e..884a75d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2016-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure.ac (GAWK_AC_AIX_TWEAK): Remove call.
+	* configure: Regenerated.
+	* io.c (GAWK_AIX): Check _AIX instead.
+	* custom.h (_AIX): Add define of _XOPEN_SOURCE_EXTENDED.
+
+	Unrelated:
+
+	* configure.ac: Remove old stuff for ISC Unix, no longer needed.
+	* configure: Regenerated.
+
+2016-01-25         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* io.c (redirect): Need to call close_one more than once after
+	  running out of file handles.
+
 2016-01-25         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* NEWS: Document VMS support updated.
diff --git a/configure b/configure
index 78864a11..af1b8ecc 100755
--- a/configure
+++ b/configure
@@ -6212,25 +6212,6 @@ rm -rf conftest*
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX compilation hacks" >&5
-$as_echo_n "checking for AIX compilation hacks... " >&6; }
-if ${gawk_cv_aix_hack+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-if test -d /lpp
-then
-	CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED=1 -DGAWK_AIX=1"
-	gawk_cv_aix_hack=yes
-else
-	gawk_cv_aix_hack=no
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${gawk_cv_aix_hack}" >&5
-$as_echo "${gawk_cv_aix_hack}" >&6; }
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we are using EBCDIC" >&5
 $as_echo_n "checking if we are using EBCDIC... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6253,11 +6234,6 @@ rm -f conftest*
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_ebcdic" >&5
 $as_echo "$use_ebcdic" >&6; }
 
-if test "$ISC" = 1	# will be set by test for ISC
-then
-	CFLAGS="$CFLAGS -D_SYSV3"
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/configure.ac b/configure.ac
index 2b52fcb7..f57d2a77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,6 @@ dnl checks for systems
 AC_ZOS_USS
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_SYS_LARGEFILE
-GAWK_AC_AIX_TWEAK
 
 AC_MSG_CHECKING([if we are using EBCDIC])
 AC_EGREP_CPP([gnu_gawk_in_ebcdic],
@@ -124,12 +123,6 @@ gnu_gawk_in_ebcdic
 [use_ebcdic=no])
 AC_MSG_RESULT([$use_ebcdic])
 
-if test "$ISC" = 1	# will be set by test for ISC
-then
-dnl	need -D_SYSV3 for ISC
-	CFLAGS="$CFLAGS -D_SYSV3"
-fi
-
 dnl Set the programming language for checks. Fortunately,
 dnl this only needs to be set once, since everything is in C.
 AC_LANG([C])
diff --git a/custom.h b/custom.h
index 956c52ab..64d4ec56 100644
--- a/custom.h
+++ b/custom.h
@@ -59,6 +59,10 @@
 #define _TZSET 1
 #endif
 
+#if defined(_AIX)
+#define _XOPEN_SOURCE_EXTENDED 1
+#endif
+
 /* Junk for dfa.[ch] */
 /* The __pure__ attribute was added in gcc 2.96.  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 9f585813..1da89814 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* filefuncs.c (do_statvfs): Define out f_fsid on AIX.
+
 2016-01-20         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* filefuncs.c: Add statvfs function. Undocumented for now.
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index ae4f7c3d..0f1c20ac 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -556,7 +556,9 @@ do_statvfs(int nargs, awk_value_t *result)
 	array_set_numeric(array, "files", vfsbuf.f_files);	/* # inodes */
 	array_set_numeric(array, "ffree", vfsbuf.f_ffree);	/* # free inodes */
 	array_set_numeric(array, "favail", vfsbuf.f_favail);	/* # free inodes for unprivileged users */
+#ifndef _AIX
 	array_set_numeric(array, "fsid", vfsbuf.f_fsid);	/* filesystem ID */
+#endif
 	array_set_numeric(array, "flag", vfsbuf.f_flag);	/* mount flags */
 	array_set_numeric(array, "namemax", vfsbuf.f_namemax);	/* maximum filename length */
 	
diff --git a/io.c b/io.c
index 0d521ed0..d618181d 100644
--- a/io.c
+++ b/io.c
@@ -190,7 +190,7 @@
 #define setsid()	/* nothing */
 #endif /* HAVE_SETSID */
 
-#if defined(GAWK_AIX)
+#if defined(_AIX)
 #undef TANDEM	/* AIX defines this in one of its header files */
 #endif
 
@@ -1021,8 +1021,10 @@ redirect_string(const char *str, size_t explen, bool not_string,
                                  (vaxc$errno == SS$_EXQUOTA ||
                                   vaxc$errno == SS$_EXBYTLM ||
                                   vaxc$errno == RMS$_ACC ||
-				  vaxc$errno == RMS$_SYN))
+				  vaxc$errno == RMS$_SYN)) {
 				close_one();
+				close_one();
+			}
 #endif
 			else {
 				/*
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 76f05960..2c0063ee 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* arch.m4 (GAWK_AC_AIX_TWEAK): Remove definition.
+
 2016-01-03         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* arch.m4 (GAWK_AC_LINUX_ALPHA): Remove definition.
diff --git a/m4/arch.m4 b/m4/arch.m4
index f156f9f3..6897a1a3 100644
--- a/m4/arch.m4
+++ b/m4/arch.m4
@@ -21,21 +21,6 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 dnl
 
-dnl Check for AIX and add _XOPEN_SOURCE_EXTENDED
-AC_DEFUN([GAWK_AC_AIX_TWEAK], [
-AC_MSG_CHECKING([for AIX compilation hacks])
-AC_CACHE_VAL(gawk_cv_aix_hack, [
-if test -d /lpp
-then
-	CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED=1 -DGAWK_AIX=1"
-	gawk_cv_aix_hack=yes
-else
-	gawk_cv_aix_hack=no
-fi
-])dnl
-AC_MSG_RESULT([${gawk_cv_aix_hack}])
-])dnl
-
 dnl Check for z/OS Unix Systems Services
 AC_DEFUN([AC_ZOS_USS], [
 AC_MSG_CHECKING([for z/OS USS compilation])
diff --git a/vms/ChangeLog b/vms/ChangeLog
index bd1f24f8..1bcf5ba7 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-27         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* generate_config_vms_h_gawk.com: Add missing define
+	  for macro TIME_T_UNSIGNED.  Remove supression of
+	  compiler message.
+
 2016-01-24         John E. Malmberg      <wb8tyw@qsl.net>
 
 	* vmstest.com: updates
diff --git a/vms/generate_config_vms_h_gawk.com b/vms/generate_config_vms_h_gawk.com
index 16d2d5b4..805b764f 100644
--- a/vms/generate_config_vms_h_gawk.com
+++ b/vms/generate_config_vms_h_gawk.com
@@ -288,7 +288,7 @@ $ write cvh "    }"
 $ write cvh "    decc$exit(vms_status);"
 $ write cvh "}"
 $ write cvh ""
-$ write cvh "#pragma message disable questcompare
+$ write cvh "#define TIME_T_UNSIGNED 1"
 $ write cvh "#include ""custom.h"""
 $ write cvh ""
 $!