Merge branch 'master' into feature/bool

8 files changed, 42 insertions, 22 deletions

diff --git a/doc/it/ChangeLog b/doc/it/ChangeLog
index df98dfbd..b1b5904a 100644
--- a/doc/it/ChangeLog
+++ b/doc/it/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-16         Antonio Giovanni Colombo   <azc100@gmail.com>
+
+	* gawktexi.in: Updated.
+
 2021-04-06         Antonio Giovanni Colombo   <azc100@gmail.com>
 
 	* gawktexi.in: Updated.
diff --git a/doc/it/gawktexi.in b/doc/it/gawktexi.in
index 0edb44e9..1469d038 100755
--- a/doc/it/gawktexi.in
+++ b/doc/it/gawktexi.in
@@ -22602,7 +22602,7 @@ usando la chiamata indiretta di funzioni:
 
 @example
 @c file eg/prog/indirectcall.awk
-# chiamataindiretta.awk --- esempio di chiamata indiretta di funzioni
+# indirectcall.awk --- esempio di chiamata indiretta di funzioni
 @c endfile
 @ignore
 @c file eg/prog/indirectcall.awk
@@ -25186,11 +25186,7 @@ main(int argc, char **argv)
 @c endfile
 @ignore
 @c file eg/lib/pwcat.c
-#ifdef ZOS_USS
-        printf("%s:%ld:%ld:%s:%s\n",
-            p->pw_name, (long) p->pw_uid,
-            (long) p->pw_gid, p->pw_dir, p->pw_shell);
-#else
+#ifdef HAVE_STRUCT_PASSWD_PW_PASSWD
 @c endfile
 @end ignore
 @c file eg/lib/pwcat.c
@@ -25200,6 +25196,10 @@ main(int argc, char **argv)
 @c endfile
 @ignore
 @c file eg/lib/pwcat.c
+#else
+        printf("%s:*:%ld:%ld:%s:%s\n",
+            p->pw_name, (long) p->pw_uid,
+            (long) p->pw_gid, p->pw_dir, p->pw_shell);
 #endif
 @c endfile
 @end ignore
@@ -27394,6 +27394,7 @@ in modo che sia stampata in maniera elegante nella pagina:
 @c endfile
 @end ignore
 @c file eg/prog/split.awk
+
 function sintassi(              comune)
 @{
     common = "[-a lunghezza-suffisso] [file [nome-output-file]]"
@@ -29348,6 +29349,7 @@ a significare che tutto @`e andato bene:
 # Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 # Revised September 2000
+# Antonio Colombo, October 2020, test for Italian accented letters
 @c endfile
 @end ignore
 @c file eg/prog/extract.awk
@@ -29822,7 +29824,6 @@ Il programma @`e il seguente:
 # Arnold Robbins, arnold@@skeeve.com, Public Domain
 # July 1993
 # December 2010, minor edits
-# Antonio Colombo, October 2020, test for Italian accented letters
 @c endfile
 @end ignore
 @c file eg/prog/igawk.sh
diff --git a/pc/ChangeLog b/pc/ChangeLog
index b2b5559a..dfb0a326 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile (DEFPATH): New variable, like in Makefile.am.
+	(CFLAGS): Include -DDEFPATH=$(DEFPATH).
+
 2021-05-13         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.tst: Regenerated.
diff --git a/pc/Makefile b/pc/Makefile
index 0dc8bb40..1055a983 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -85,6 +85,7 @@ MAK = $(MAKE) $(MAKEFILE)
 prefix = c:/gnu
 pkgdatadir = $(prefix)/lib/awk
 pkgextensiondir = $(prefix)/lib/gawk
+DEFPATH = "\".;$(pkgdatadir);c:/lib/awk;c:/gnu/lib/awk\""
 DEFLIBPATH = "\"$(pkgextensiondir)\""
 LOCALEDIR="\"$(prefix)/share/locale\""
 SHLIBEXT = "\"dll\""
@@ -228,7 +229,7 @@ BIND = EMPTY
 PBIND = EMPTY
 EMPTY=
 
-CFLAGS = $(CF) -DGAWK -I. -I./support -DHAVE_CONFIG_H -DDEFLIBPATH=$(DEFLIBPATH) -DSHLIBEXT=$(SHLIBEXT) -DLOCALEDIR=$(LOCALEDIR)
+CFLAGS = $(CF) -DGAWK -I. -I./support -DHAVE_CONFIG_H -DDEFPATH=$(DEFPATH) -DDEFLIBPATH=$(DEFLIBPATH) -DSHLIBEXT=$(SHLIBEXT) -DLOCALEDIR=$(LOCALEDIR)
 
 # object files
 AWKOBJS1  = array$O builtin$O eval$O field$O floatcomp$O gawkmisc$O io$O main$O
diff --git a/po/it.po b/po/it.po
index 1a35375d..1a35375d 100644..100755
--- a/po/it.po
+++ b/po/it.po
diff --git a/test/ChangeLog b/test/ChangeLog
index 991c4caf..387c6a9d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* iolint.ok: Reorder results to follow the order of iolint.awk.
+
+	* iolint.awk: Use "BINMODE = 2", otherwise the result of cksum on
+	non-Posix platforms will not match.  Reorder the tests to make the
+	binary mode used only in the last one.
+
 2021-05-13         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (EXPECTED_FAIL_ZOS): Updated and sorted / uniqued.
diff --git a/test/iolint.awk b/test/iolint.awk
index a866ed6d..257678ed 100644
--- a/test/iolint.awk
+++ b/test/iolint.awk
@@ -37,13 +37,6 @@ BEGIN {
 	print close("f2")	# -1 expected here
 	fflush()
 
-	# `%.*s' used for output file and output pipe"
-	print "junk" > "cksum"	# cksum is more portable than md5sum
-	print "hello" | "cksum"
-	print close("cksum")
-	print close("cksum")
-	fflush()
-
 	# `%.*s' used for input pipe and output file
 	"echo hello" | getline junk
 	print "hello" > "echo hello"
@@ -68,4 +61,12 @@ BEGIN {
 	print close("echo hello")
 	print close("echo hello")
 	fflush()
+
+	# `%.*s' used for output file and output pipe"
+	BINMODE = 2
+	print "junk" > "cksum"	# cksum is more portable than md5sum
+	print "hello" | "cksum"
+	print close("cksum")
+	print close("cksum")
+	fflush()
 }
diff --git a/test/iolint.ok b/test/iolint.ok
index 0008b0aa..fbf514c2 100644
--- a/test/iolint.ok
+++ b/test/iolint.ok
@@ -16,18 +16,18 @@ gawk: iolint.awk:35: warning: unnecessary mixing of `>' and `>>' for file `f2'
 0
 gawk: iolint.awk:37: warning: close: `f2' is not an open file, pipe or co-process
 -1
-gawk: iolint.awk:42: warning: `cksum' used for output file and output pipe
-3015617425 6
-0
-0
-gawk: iolint.awk:49: warning: `echo hello' used for input pipe and output file
+gawk: iolint.awk:42: warning: `echo hello' used for input pipe and output file
 0
 0
-gawk: iolint.awk:60: warning: `cat' used for output file and output pipe
+gawk: iolint.awk:53: warning: `cat' used for output file and output pipe
 0
 hello
 0
-gawk: iolint.awk:67: warning: `echo hello' used for input pipe and output pipe
+gawk: iolint.awk:60: warning: `echo hello' used for input pipe and output pipe
 hello
 0
 0
+gawk: iolint.awk:68: warning: `cksum' used for output file and output pipe
+3015617425 6
+0
+0