aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--README4
-rw-r--r--README_d/ChangeLog4
-rw-r--r--awk.h7
-rw-r--r--awkgram.c4
-rw-r--r--awkgram.y4
-rw-r--r--awklib/ChangeLog4
-rw-r--r--cmake/ChangeLog4
-rwxr-xr-xconfig.guess8
-rwxr-xr-xconfig.sub5
-rw-r--r--configure.ac2
-rw-r--r--debug.c7
-rw-r--r--doc/ChangeLog13
-rw-r--r--doc/awkcard.in8
-rw-r--r--doc/gawk.texi2
-rw-r--r--doc/gawktexi.in2
-rw-r--r--doc/it/ChangeLog4
-rw-r--r--doc/texinfo.tex4
-rw-r--r--extension/ChangeLog4
-rw-r--r--extension/build-aux/ChangeLog8
-rwxr-xr-xextension/build-aux/config.guess8
-rwxr-xr-xextension/build-aux/config.sub5
-rwxr-xr-xextension/configure20
-rw-r--r--extension/configure.ac2
-rw-r--r--extension/m4/ChangeLog4
-rw-r--r--extras/ChangeLog4
-rw-r--r--helpers/ChangeLog4
-rw-r--r--io.c4
-rw-r--r--m4/ChangeLog4
-rw-r--r--missing_d/ChangeLog4
-rw-r--r--old-extension/ChangeLog4
-rw-r--r--pc/ChangeLog8
-rw-r--r--pc/Makefile2
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ca.gmobin77799 -> 77799 bytes
-rw-r--r--po/ca.po2
-rw-r--r--po/da.gmobin47570 -> 47570 bytes
-rw-r--r--po/da.po2
-rw-r--r--po/de.gmobin87626 -> 87626 bytes
-rw-r--r--po/de.po2
-rw-r--r--po/es.gmobin41918 -> 41918 bytes
-rw-r--r--po/es.po2
-rw-r--r--po/fi.gmobin84744 -> 84744 bytes
-rw-r--r--po/fi.po2
-rw-r--r--po/fr.gmobin88683 -> 88683 bytes
-rw-r--r--po/fr.po2
-rw-r--r--po/gawk.pot4
-rw-r--r--po/id.gmobin71064 -> 71064 bytes
-rw-r--r--po/id.po2
-rw-r--r--po/it.gmobin84539 -> 84539 bytes
-rw-r--r--po/it.po2
-rw-r--r--po/ja.gmobin48204 -> 48204 bytes
-rw-r--r--po/ja.po2
-rw-r--r--po/ms.gmobin1082 -> 1082 bytes
-rw-r--r--po/ms.po2
-rw-r--r--po/nl.gmobin75617 -> 75617 bytes
-rw-r--r--po/nl.po2
-rw-r--r--po/pl.gmobin63078 -> 63078 bytes
-rw-r--r--po/pl.po2
-rw-r--r--po/pt_BR.gmobin85026 -> 85026 bytes
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/sv.gmobin84719 -> 84719 bytes
-rw-r--r--po/sv.po2
-rw-r--r--po/vi.gmobin95954 -> 95954 bytes
-rw-r--r--po/vi.po2
-rw-r--r--po/zh_CN.gmobin79203 -> 79203 bytes
-rw-r--r--po/zh_CN.po2
-rw-r--r--posix/ChangeLog9
-rw-r--r--posix/gawkmisc.c20
-rw-r--r--support/ChangeLog4
-rw-r--r--test/ChangeLog11
-rw-r--r--test/Makefile.am8
-rw-r--r--test/Makefile.in8
-rw-r--r--test/nlstringtest-nogettext.ok5
-rw-r--r--vms/ChangeLog4
-rw-r--r--vms/vax/ChangeLog4
76 files changed, 236 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index 97ae42ff..302c7a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2018-03-05 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awk.h [PUSH_BINDING, POP_BINDING]: Moved to ...
+ * debug.c: here.
+ * awkgram.y (yylex): Make do_etoa_init into a boolean.
+ * io.c (rs1scan): Make found into a boolean.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * config.guess, config.sub: Updated.
+
2018-02-23 Arnold D. Robbins <arnold@skeeve.com>
* configure.ac: Restore checking for PPC Macintosh before
diff --git a/README b/README
index 47b217d3..9696fb31 100644
--- a/README
+++ b/README
@@ -7,11 +7,11 @@
README:
-This is GNU Awk 4.2.0. It is upwardly compatible with Brian Kernighan's
+This is GNU Awk 4.2.1. It is upwardly compatible with Brian Kernighan's
version of Unix awk. It is almost completely compliant with the
2008 POSIX 1003.1 standard for awk. (See the note below about POSIX.)
-This is a major release. See NEWS and ChangeLog for details.
+This is a bug-fix release. See NEWS and ChangeLog for details.
Work to be done is described briefly in the TODO file, which is available
only in the 'master' branch in the Git repo.
diff --git a/README_d/ChangeLog b/README_d/ChangeLog
index e5fb5c4a..13e5898c 100644
--- a/README_d/ChangeLog
+++ b/README_d/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-02-23 Arnold D. Robbins <arnold@skeeve.com>
* README.macosx: Updated.
diff --git a/awk.h b/awk.h
index 761006f0..88811f20 100644
--- a/awk.h
+++ b/awk.h
@@ -1339,13 +1339,6 @@ DEREF(NODE *r)
extern jmp_buf fatal_tag;
extern int fatal_tag_valid;
-#define PUSH_BINDING(stack, tag, val) \
-if (val++) \
- memcpy((char *) (stack), (const char *) tag, sizeof(jmp_buf))
-#define POP_BINDING(stack, tag, val) \
-if (--val) \
- memcpy((char *) tag, (const char *) (stack), sizeof(jmp_buf))
-
#define assoc_length(a) ((*((a)->alength(a, NULL)))->table_size)
#define assoc_empty(a) (assoc_length(a) == 0)
#define assoc_lookup(a, s) ((a)->alookup(a, s))
diff --git a/awkgram.c b/awkgram.c
index 210be4d4..9ae84261 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -6706,7 +6706,7 @@ static int
yylex(void)
{
static char etoa_xlate[256];
- static int do_etoa_init = 1;
+ static bool do_etoa_init = true;
int tok;
if (do_etoa_init)
@@ -6719,7 +6719,7 @@ yylex(void)
#else
# error "An EBCDIC-to-ASCII translation function is needed for this system"
#endif
- do_etoa_init = 0;
+ do_etoa_init = false;
}
tok = yylex_ebcdic();
diff --git a/awkgram.y b/awkgram.y
index 9fd96d0d..4eb755f1 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -4286,7 +4286,7 @@ static int
yylex(void)
{
static char etoa_xlate[256];
- static int do_etoa_init = 1;
+ static bool do_etoa_init = true;
int tok;
if (do_etoa_init)
@@ -4299,7 +4299,7 @@ yylex(void)
#else
# error "An EBCDIC-to-ASCII translation function is needed for this system"
#endif
- do_etoa_init = 0;
+ do_etoa_init = false;
}
tok = yylex_ebcdic();
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index 1c4d9048..17fb3ca3 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/cmake/ChangeLog b/cmake/ChangeLog
index ba1d5665..8437a289 100644
--- a/cmake/ChangeLog
+++ b/cmake/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/config.guess b/config.guess
index 9baaa270..f50dcdb6 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-01-26'
+timestamp='2018-02-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1046,7 +1046,11 @@ EOF
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+ else
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ fi
exit ;;
xtensa*:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
diff --git a/config.sub b/config.sub
index 818892c1..1d8e98bc 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-01-15'
+timestamp='2018-02-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1389,7 +1389,8 @@ case $os in
| -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+ | -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/configure.ac b/configure.ac
index fd7b73ae..37c73b76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl
dnl configure.ac --- autoconf input file for gawk
dnl
-dnl Copyright (C) 1995-2017 the Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2018 the Free Software Foundation, Inc.
dnl
dnl This file is part of GAWK, the GNU implementation of the
dnl AWK Programming Language.
diff --git a/debug.c b/debug.c
index 3e76ae61..7a5ad21b 100644
--- a/debug.c
+++ b/debug.c
@@ -338,6 +338,13 @@ struct command_source
static struct command_source *cmd_src = NULL;
+#define PUSH_BINDING(stack, tag, val) \
+if (val++) \
+ memcpy((char *) (stack), (const char *) tag, sizeof(jmp_buf))
+#define POP_BINDING(stack, tag, val) \
+if (--val) \
+ memcpy((char *) tag, (const char *) (stack), sizeof(jmp_buf))
+
#define CHECK_PROG_RUNNING() \
do { \
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fe48e088..41e65751 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,16 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawktexi.in: Update UPDATE-MONTH.
+ * awkcard.in: Update tar ball version and copyright year.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * texinfo.tex: Updated.
+
2018-02-17 Arnold D. Robbins <arnold@skeeve.com>
* gawktexi.in: Further fix to NONFATAL stuff. Thanks to
diff --git a/doc/awkcard.in b/doc/awkcard.in
index 851371b8..1148294a 100644
--- a/doc/awkcard.in
+++ b/doc/awkcard.in
@@ -1,7 +1,7 @@
.\" AWK Reference Card --- Arnold Robbins, arnold@skeeve.com
.\"
.\" Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-.\" 2005, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
+.\" 2005, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
.\" Free Software Foundation, Inc.
.\"
.\" Permission is granted to make and distribute verbatim copies of
@@ -100,7 +100,7 @@ Brian Kernighan and Michael Brennan who reviewed it.
\*(CD
.SL
.nf
-\*(FRCopyright \(co 1996\(en2005, 2007, 2009\(en2017
+\*(FRCopyright \(co 1996\(en2005, 2007, 2009\(en2018
Free Software Foundation, Inc.
.nf
.BT
@@ -1957,7 +1957,7 @@ to use the current domain.\*(CB
.ES
.nf
\*(CDHost: \*(FCftp.gnu.org\*(FR
-File: \*(FC/gnu/gawk/gawk-4.2.0.tar.gz\fP
+File: \*(FC/gnu/gawk/gawk-4.2.1.tar.gz\fP
.in +.2i
.fi
GNU \*(AK (\*(GK). There may be a later version.
@@ -1988,7 +1988,7 @@ maintains it.\*(CX
.ES
.fi
\*(CDCopyright \(co 1996\(en2005,
-2007, 2009\(en2017 Free Software Foundation, Inc.
+2007, 2009\(en2018 Free Software Foundation, Inc.
.sp .5
Permission is granted to make and distribute verbatim copies of this
reference card provided the copyright notice and this permission notice
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 5c812c7d..349fa259 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -64,7 +64,7 @@
@c applies to and all the info about who's publishing this edition
@c These apply across the board.
-@set UPDATE-MONTH January, 2018
+@set UPDATE-MONTH February, 2018
@set VERSION 4.2
@set PATCHLEVEL 1
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 0cd3bd47..c89006e3 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -59,7 +59,7 @@
@c applies to and all the info about who's publishing this edition
@c These apply across the board.
-@set UPDATE-MONTH January, 2018
+@set UPDATE-MONTH February, 2018
@set VERSION 4.2
@set PATCHLEVEL 1
diff --git a/doc/it/ChangeLog b/doc/it/ChangeLog
index dcdd0a4a..ae124a3a 100644
--- a/doc/it/ChangeLog
+++ b/doc/it/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-02-17 Antonio Giovanni Colombo <azc100@gmail.com>
* gawktexi.in: More updates.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index c614e024..ac5c1d92 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2018-01-09.11}
+\def\texinfoversion{2018-02-12.17}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -182,7 +182,7 @@
% Hyphenation fixes.
\hyphenation{
Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
- ap-pen-dix bit-map bit-maps
+ auto-ma-ti-cal-ly ap-pen-dix bit-map bit-maps
data-base data-bases eshell fall-ing half-way long-est man-u-script
man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
diff --git a/extension/ChangeLog b/extension/ChangeLog
index a670d81c..7269508c 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-02-23 Arnold D. Robbins <arnold@skeeve.com>
* configure.ac: Restore checking for PPC Macintosh before
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 84a51879..5baa799f 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,11 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * config.guess, config.sub: Updated.
+
2018-01-28 Arnold D. Robbins <arnold@skeeve.com>
* config.guess, config.sub: Updated.
diff --git a/extension/build-aux/config.guess b/extension/build-aux/config.guess
index 9baaa270..f50dcdb6 100755
--- a/extension/build-aux/config.guess
+++ b/extension/build-aux/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-01-26'
+timestamp='2018-02-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1046,7 +1046,11 @@ EOF
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+ else
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ fi
exit ;;
xtensa*:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
diff --git a/extension/build-aux/config.sub b/extension/build-aux/config.sub
index 818892c1..1d8e98bc 100755
--- a/extension/build-aux/config.sub
+++ b/extension/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-01-15'
+timestamp='2018-02-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1389,7 +1389,8 @@ case $os in
| -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+ | -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/extension/configure b/extension/configure
index 3bdccfc0..52879641 100755
--- a/extension/configure
+++ b/extension/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU Awk Bundled Extensions 4.2.0.
+# Generated by GNU Autoconf 2.69 for GNU Awk Bundled Extensions 4.2.1.
#
# Report bugs to <bug-gawk@gnu.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Awk Bundled Extensions'
PACKAGE_TARNAME='gawk-extensions'
-PACKAGE_VERSION='4.2.0'
-PACKAGE_STRING='GNU Awk Bundled Extensions 4.2.0'
+PACKAGE_VERSION='4.2.1'
+PACKAGE_STRING='GNU Awk Bundled Extensions 4.2.1'
PACKAGE_BUGREPORT='bug-gawk@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/gawk-extensions/'
@@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Awk Bundled Extensions 4.2.0 to adapt to many kinds of systems.
+\`configure' configures GNU Awk Bundled Extensions 4.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1409,7 +1409,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Awk Bundled Extensions 4.2.0:";;
+ short | recursive ) echo "Configuration of GNU Awk Bundled Extensions 4.2.1:";;
esac
cat <<\_ACEOF
@@ -1531,7 +1531,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Awk Bundled Extensions configure 4.2.0
+GNU Awk Bundled Extensions configure 4.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2003,7 +2003,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Awk Bundled Extensions $as_me 4.2.0, which was
+It was created by GNU Awk Bundled Extensions $as_me 4.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2872,7 +2872,7 @@ fi
# Define the identity of the package.
PACKAGE='gawk-extensions'
- VERSION='4.2.0'
+ VERSION='4.2.1'
cat >>confdefs.h <<_ACEOF
@@ -15924,7 +15924,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Awk Bundled Extensions $as_me 4.2.0, which was
+This file was extended by GNU Awk Bundled Extensions $as_me 4.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15992,7 +15992,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU Awk Bundled Extensions config.status 4.2.0
+GNU Awk Bundled Extensions config.status 4.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/extension/configure.ac b/extension/configure.ac
index 8d44e2b2..d2f72a7c 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -23,7 +23,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([GNU Awk Bundled Extensions],[4.2.0],[bug-gawk@gnu.org],[gawk-extensions])
+AC_INIT([GNU Awk Bundled Extensions],[4.2.1],[bug-gawk@gnu.org],[gawk-extensions])
AC_PREREQ([2.69])
diff --git a/extension/m4/ChangeLog b/extension/m4/ChangeLog
index 92f53859..75c2b122 100644
--- a/extension/m4/ChangeLog
+++ b/extension/m4/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/extras/ChangeLog b/extras/ChangeLog
index 0ca442c2..2bd75e52 100644
--- a/extras/ChangeLog
+++ b/extras/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/helpers/ChangeLog b/helpers/ChangeLog
index d4312faa..d54de869 100644
--- a/helpers/ChangeLog
+++ b/helpers/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-12-28 Arnold D. Robbins <arnold@skeeve.com>
* update-aux.sh: New script.
diff --git a/io.c b/io.c
index 1a1d8cc2..9ca29dac 100644
--- a/io.c
+++ b/io.c
@@ -3535,12 +3535,12 @@ rs1scan(IOBUF *iop, struct recmatch *recm, SCANSTATE *state)
/* Thus, the check for \n here; big speedup ! */
if (rs != '\n' && gawk_mb_cur_max > 1) {
int len = iop->dataend - bp;
- int found = 0;
+ bool found = false;
memset(& mbs, 0, sizeof(mbstate_t));
do {
if (*bp == rs)
- found = 1;
+ found = true;
if (is_valid_character(*bp))
mbclen = 1;
else
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 31404341..840e78de 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index 8043677a..1713f030 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-11-07 John E. Malmberg <wb8tyw@qsl.net>
* Remove varargs.h usage in snprintf.c
diff --git a/old-extension/ChangeLog b/old-extension/ChangeLog
index 5249972e..0e67c74a 100644
--- a/old-extension/ChangeLog
+++ b/old-extension/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 866d133d..28f6e8eb 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-03 Eli Zaretskii <eliz@gnu.org>
+
+ * Makefile (install1): Create parent directories of $(pkgextensiondir).
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-02-17 Eli Zaretskii <eliz@gnu.org>
* Makefile.tst (BASIC_TESTS): Add uplus.
diff --git a/pc/Makefile b/pc/Makefile
index fb34965b..85594a65 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -325,7 +325,9 @@ install1:
-mkdir "$(prefix)/bin"
-mkdir "$(prefix)/share"
-mkdir "$(prefix)/share/man"
+ -mkdir "$(prefix)/lib"
-mkdir "$(pkgdatadir)" "$(prefix)/share/man/man1" "$(prefix)/share/info"
+ -mkdir "$(prefix)/lib/gawk"
cp gawk.exe $(prefix)/bin/awk.exe
cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
cp gawkapi.h $(prefix)/include
diff --git a/po/ChangeLog b/po/ChangeLog
index 575b488e..2563ed41 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-02-07 Arnold D. Robbins <arnold@skeeve.com>
* zh_CN.po: Updated.
diff --git a/po/ca.gmo b/po/ca.gmo
index 999a7c8e..0c7e154b 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
Binary files differ
diff --git a/po/ca.po b/po/ca.po
index e21e2a5b..c440226d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.3h\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2016-12-18 19:51+0100\n"
"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
diff --git a/po/da.gmo b/po/da.gmo
index ec4ef100..34a3720c 100644
--- a/po/da.gmo
+++ b/po/da.gmo
Binary files differ
diff --git a/po/da.po b/po/da.po
index 41a8a012..c1ed74e4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.1d\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2015-05-18 12:37+0200\n"
"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/po/de.gmo b/po/de.gmo
index ea38a4a5..c1bbce09 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 16c35ef6..a392f311 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.64\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2017-09-18 09:08+0200\n"
"Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/po/es.gmo b/po/es.gmo
index ad54171d..33787982 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index e4089508..e79e60c5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.0.0h\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2012-01-30 07:42-0600\n"
"Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index b719659b..39286286 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
Binary files differ
diff --git a/po/fi.po b/po/fi.po
index f9c3a976..4e01ec99 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.62\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2017-08-19 12:18+0300\n"
"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index b406c13f..b4de2aeb 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index ec698503..25488d42 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.2.0e\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2018-01-29 23:26+0100\n"
"Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
"org>\n"
diff --git a/po/gawk.pot b/po/gawk.pot
index 52b8b882..8eb57507 100644
--- a/po/gawk.pot
+++ b/po/gawk.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gawk 4.2.0f\n"
+"Project-Id-Version: gawk 4.2.1\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/id.gmo b/po/id.gmo
index 7cf9ed38..a0382117 100644
--- a/po/id.gmo
+++ b/po/id.gmo
Binary files differ
diff --git a/po/id.po b/po/id.po
index 52878a42..9c0cc47c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.0b\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2014-08-03 07:30+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
diff --git a/po/it.gmo b/po/it.gmo
index 718730c0..1a6db0ac 100644
--- a/po/it.gmo
+++ b/po/it.gmo
Binary files differ
diff --git a/po/it.po b/po/it.po
index 7670b920..d0c4a331 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU Awk 4.2.1, API: 2.0\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2018-01-30 20:00+0100\n"
"Last-Translator: Antonio Colombo <azc100@gmail.com>\n"
"Language-Team: Italian <it@li.org>\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index 7e65fce5..637c137a 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ja.po b/po/ja.po
index ea576f02..9bd99c9e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.0b\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2014-11-07 12:26+0000\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
diff --git a/po/ms.gmo b/po/ms.gmo
index fe021620..a1860b98 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
Binary files differ
diff --git a/po/ms.po b/po/ms.po
index 1f4a72fc..b09b1b75 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.0.75\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2013-04-19 10:45+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index de4bb26c..4f93fc70 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index a393b807..d5a50aeb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.3h\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2016-08-08 09:21+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index a2c3e925..42c108ac 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index f609a1c2..46e53f33 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.1.0b\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2014-03-22 17:49+0100\n"
"Last-Translator: Wojciech Polak <polak@gnu.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index f19bb859..99175145 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
Binary files differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 119b42d6..86c25efc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.2.0e\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2018-01-30 09:57-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
diff --git a/po/sv.gmo b/po/sv.gmo
index a7aa8d20..d853b3de 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index 8447a0a5..c65c9150 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.2.0e\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2018-01-30 10:02+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 3c52750e..cb0957ab 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
Binary files differ
diff --git a/po/vi.po b/po/vi.po
index 138d8b5d..cc515d1e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.2.0e\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2018-01-30 08:07+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index f2180d77..35d98b5d 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 431598c6..72363262 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gawk 4.2.0e\n"
"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
-"POT-Creation-Date: 2018-02-13 22:33+0200\n"
+"POT-Creation-Date: 2018-02-25 19:17+0200\n"
"PO-Revision-Date: 2018-02-05 19:53+0100\n"
"Last-Translator: Tianze Wang <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
diff --git a/posix/ChangeLog b/posix/ChangeLog
index 1b74804b..9ec9907c 100644
--- a/posix/ChangeLog
+++ b/posix/ChangeLog
@@ -1,3 +1,12 @@
+2018-03-05 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkmisc.c (cygwin_premain0, cygwin_premain2): Restored for
+ use in MSYS environment only.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.
diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c
index ecf5aff9..16cfeb03 100644
--- a/posix/gawkmisc.c
+++ b/posix/gawkmisc.c
@@ -289,3 +289,23 @@ void
init_sockets(void)
{
}
+
+// For MSYS, restore behavior of working in text mode.
+#ifdef __MSYS__
+void
+cygwin_premain0(int argc, char **argv, struct per_process *myself)
+{
+ static struct __cygwin_perfile pf[] = {
+ { "", O_RDONLY | O_TEXT },
+ /*{ "", O_WRONLY | O_BINARY },*/
+ { NULL, 0 }
+ };
+ cygwin_internal(CW_PERFILE, pf);
+}
+
+void
+cygwin_premain2(int argc, char **argv, struct per_process *myself)
+{
+ setmode(fileno (stdin), O_TEXT);
+}
+#endif
diff --git a/support/ChangeLog b/support/ChangeLog
index 58669a5c..47399609 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-12-24 Arnold D. Robbins <arnold@skeeve.com>
* getopt.c: Include <stdlib.h> to get declarations of
diff --git a/test/ChangeLog b/test/ChangeLog
index e633b33e..cd3813cc 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2018-03-05 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXTRA_DIST): Add nlstringtest-nogettext.ok.
+ * (nlstringtest): Compare to nlstringtest-nogettext.ok first,
+ in case gawk was built without GNU gettext.
+ * nlstringtest-nogettext.ok: New file.
+
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-02-10 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (mtchi18n): Move into locale tests.
diff --git a/test/Makefile.am b/test/Makefile.am
index bf1dbd32..f0cd20d1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -720,6 +720,7 @@ EXTRA_DIST = \
nlstringtest.awk \
nlstringtest.ok \
nlstringtest.po \
+ nlstringtest-nogettext.ok \
fr \
noeffect.awk \
noeffect.ok \
@@ -2477,7 +2478,12 @@ nlstringtest::
@echo $@
@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \
AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
+ then \
+ rm -f _$@ ; \
+ else \
+ $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \
+ fi
# Targets generated for other tests:
diff --git a/test/Makefile.in b/test/Makefile.in
index f96151be..927544fa 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -978,6 +978,7 @@ EXTRA_DIST = \
nlstringtest.awk \
nlstringtest.ok \
nlstringtest.po \
+ nlstringtest-nogettext.ok \
fr \
noeffect.awk \
noeffect.ok \
@@ -2914,7 +2915,12 @@ nlstringtest::
@echo $@
@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \
AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
+ then \
+ rm -f _$@ ; \
+ else \
+ $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \
+ fi
Gt-dummy:
# file Maketests, generated from Makefile.am by the Gentests program
addcomma:
diff --git a/test/nlstringtest-nogettext.ok b/test/nlstringtest-nogettext.ok
new file mode 100644
index 00000000..3834800c
--- /dev/null
+++ b/test/nlstringtest-nogettext.ok
@@ -0,0 +1,5 @@
+2 pieces of cake
+%s is replaced by %s.
+%s is replaced by %s.
+
+FF is replaced by EUR.
diff --git a/vms/ChangeLog b/vms/ChangeLog
index d00e38a4..f2f2aa00 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2018-01-22 John E. Malmberg <wb8tyw@qsl.net>
* vmstest.com: New tests: isarrayunset, nlstringtest
diff --git a/vms/vax/ChangeLog b/vms/vax/ChangeLog
index 2416ed25..ccc3a9e3 100644
--- a/vms/vax/ChangeLog
+++ b/vms/vax/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.2.1: Release tar ball made.
+
2017-10-19 Arnold D. Robbins <arnold@skeeve.com>
* 4.2.0: Release tar ball made.