Merge branch 'gawk-4.1-stable'

2 files changed, 10 insertions, 9 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index b655322a..c21a3675 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,4 +1,11 @@
-2014-01-28  Eli Zaretskii  <eliz@gnu.org>
+2014-02-03         Stepan Kasal         <kasal@ucw.cz>
+
+	* strftime.awk: the default format uses %e, not %d (Introduced on
+	2014-01-16; the previous code mangled the output of command "date"
+	to match %d.) Remove the "mucking" for cygwin, it's obsolete and
+	incompatible with %e.
+
+2014-01-28         Eli Zaretskii        <eliz@gnu.org>
 
 	* strftime.awk: If DATECMD variable is non-empty, use it instead
 	of the literal "date" as the 'date'-like command.
diff --git a/test/strftime.awk b/test/strftime.awk
index 73cdc698..f1276c15 100644
--- a/test/strftime.awk
+++ b/test/strftime.awk
@@ -1,10 +1,6 @@
 # strftime.awk ; test the strftime code
 #
 # input is the output of `date', see Makefile.in
-#
-# The mucking about with $0 and $NF is to avoid problems
-# on cygwin, where the timezone field is empty and there
-# are two consecutive blanks.
 
 BEGIN {
 	maxtries = 10
@@ -13,7 +9,7 @@ BEGIN {
 	datecmd = DATECMD
 	if (datecmd == "")
 	    datecmd = "date"
-	fmt = "%a %b %d %H:%M:%S %Z %Y"
+	fmt = "%a %b %e %H:%M:%S %Z %Y"
 
 	# loop until before equals after, thereby protecting
 	# against a race condition where the seconds field might have
@@ -35,7 +31,5 @@ BEGIN {
 		}
 	}
 	print sd > "strftime.ok"
-	$0 = after
-	$NF = $NF
-	print > OUTPUT
+	print after > OUTPUT
 }