Merge branch 'gawk-4.1-stable'

14 files changed, 108 insertions, 78 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c7b335a..d49848c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-03         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (negate_num): Bracket `tval' in #ifdef MPFR since it's
+	only used in that code.
+
 2014-01-31         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (dist-hook): Improve creation of pc/config.h. We
diff --git a/awkgram.c b/awkgram.c
index 58ac3480..cd37cd7d 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -4512,7 +4512,9 @@ getfname(NODE *(*fptr)(int))
 void
 negate_num(NODE *n)
 {
+#ifdef HAVE_MPFR
 	int tval = 0;
+#endif
 
 	if (! is_mpg_number(n)) {
 		n->numbr = -n->numbr;
diff --git a/awkgram.y b/awkgram.y
index 6bbc150a..ecce1f6e 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1964,7 +1964,9 @@ getfname(NODE *(*fptr)(int))
 void
 negate_num(NODE *n)
 {
+#ifdef HAVE_MPFR
 	int tval = 0;
+#endif
 
 	if (! is_mpg_number(n)) {
 		n->numbr = -n->numbr;
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 135bd350..9317004d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-03         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in, gawkinet.texi: Minor fixes, mostly in indexing.
+	* texinfo.tex: Update to latest.
+
 2014-01-31         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Add `()' to names of extension functions in indexing
diff --git a/doc/gawk.info b/doc/gawk.info
index 4046c106..a823cdbe 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -30019,7 +30019,6 @@ Index
 * - (hyphen), in bracket expressions:    Bracket Expressions. (line  17)
 * --assign option:                       Options.             (line  46)
 * --bignum option:                       Options.             (line 201)
-* --c option:                            Options.             (line  95)
 * --characters-as-bytes option:          Options.             (line  82)
 * --copyright option:                    Options.             (line 102)
 * --debug option:                        Options.             (line 122)
@@ -30038,7 +30037,6 @@ Index
 * --gen-pot option:                      Options.             (line 161)
 * --help option:                         Options.             (line 168)
 * --include option:                      Options.             (line  32)
-* --L option:                            Options.             (line 288)
 * --lint option <1>:                     Options.             (line 182)
 * --lint option:                         Command Line.        (line  20)
 * --lint-old option:                     Options.             (line 288)
@@ -30069,6 +30067,7 @@ Index
                                                               (line  35)
 * -b option:                             Options.             (line  82)
 * -C option:                             Options.             (line 102)
+* -c option:                             Options.             (line  95)
 * -D option:                             Options.             (line 122)
 * -d option:                             Options.             (line 107)
 * -E option:                             Options.             (line 139)
@@ -30083,6 +30082,7 @@ Index
 * -g option:                             Options.             (line 161)
 * -h option:                             Options.             (line 168)
 * -i option:                             Options.             (line  32)
+* -L option:                             Options.             (line 288)
 * -l option:                             Options.             (line 173)
 * -M option:                             Options.             (line 201)
 * -N option:                             Options.             (line 215)
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 10fd9b2c..4b6cba0e 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -1261,7 +1261,7 @@ and the program ``the @command{awk} utility.''
 This @value{DOCUMENT} explains
 both how to write programs in the @command{awk} language and how to
 run the @command{awk} utility.
-The term @dfn{@command{awk} program} refers to a program written by you in
+The term ``@command{awk} program'' refers to a program written by you in
 the @command{awk} programming language.
 
 @cindex @command{gawk}, @command{awk} and
@@ -3338,7 +3338,7 @@ multibyte characters. This option is an easy way to tell @command{gawk}:
 
 @item -c
 @itemx --traditional
-@cindex @code{--c} option
+@cindex @code{-c} option
 @cindex @code{--traditional} option
 @cindex compatibility mode (@command{gawk}), specifying
 Specify @dfn{compatibility mode}, in which the GNU extensions to
@@ -3633,7 +3633,7 @@ can't access your system (other than the specified input data file).
 
 @item -t
 @itemx --lint-old
-@cindex @code{--L} option
+@cindex @code{-L} option
 @cindex @code{--lint-old} option
 Warn about constructs that are not available in the original version of
 @command{awk} from Version 7 Unix
@@ -8855,8 +8855,8 @@ Redirections in @command{awk} are written just like redirections in shell
 commands, except that they are written inside the @command{awk} program.
 
 @c the commas here are part of the see also
-@cindex @code{print} statement, See Also redirection, of output
-@cindex @code{printf} statement, See Also redirection, of output
+@cindex @code{print} statement, See Also redirection@comma{} of output
+@cindex @code{printf} statement, See Also redirection@comma{} of output
 There are four forms of output redirection: output to a file, output
 appended to a file, output through a pipe to another command, and output
 to a coprocess.  They are all shown for the @code{print} statement,
@@ -20644,7 +20644,7 @@ use @code{getopt()} to process their arguments.
 @c STARTOFRANGE libfudata
 @cindex libraries of @command{awk} functions, user database, reading
 @c STARTOFRANGE flibudata
-@cindex functions, library, user database, reading
+@cindex functions, library, user database@comma{} reading
 @c STARTOFRANGE udatar
 @cindex user database@comma{} reading
 @c STARTOFRANGE dataur
@@ -21012,7 +21012,7 @@ uses these functions.
 @c STARTOFRANGE libfgdata
 @cindex libraries of @command{awk} functions, group database, reading
 @c STARTOFRANGE flibgdata
-@cindex functions, library, group database, reading
+@cindex functions, library, group database@comma{} reading
 @c STARTOFRANGE gdatar
 @cindex group database, reading
 @c STARTOFRANGE datagr
@@ -24951,7 +24951,7 @@ It contains the following chapters:
 
 @node Advanced Features
 @chapter Advanced Features of @command{gawk}
-@cindex advanced features, network connections, See Also networks, connections
+@cindex advanced features, network connections, See Also networks@comma{} connections
 @c STARTOFRANGE gawadv
 @cindex @command{gawk}, features, advanced
 @c STARTOFRANGE advgaw
@@ -34620,7 +34620,7 @@ helping David Trueman, and as the primary maintainer since around 1994.
 @appendix Installing @command{gawk}
 
 @c last two commas are part of see also
-@cindex operating systems, See Also GNU/Linux, PC operating systems, Unix
+@cindex operating systems, See Also GNU/Linux@comma{} PC operating systems@comma{} Unix
 @c STARTOFRANGE gligawk
 @cindex @command{gawk}, installing
 @c STARTOFRANGE ingawk
diff --git a/doc/gawkinet.info b/doc/gawkinet.info
index c8ce6b8d..0a0d69d8 100644
--- a/doc/gawkinet.info
+++ b/doc/gawkinet.info
@@ -613,7 +613,7 @@ tcp, udp    x           0           x           Invalid
 tcp, udp    0           0           0           Invalid
 tcp, udp    0           x           0           Invalid
 
-Table    2.1: /inet Special File Components
+Table 2.1: /inet Special File Components
 
    In general, TCP is the preferred mechanism to use.  It is the
 simplest protocol to understand and to use.  Use UDP only if
@@ -4358,40 +4358,40 @@ Node: Using Networking17966
 Node: Gawk Special Files20284
 Node: Special File Fields22094
 Ref: table-inet-components25967
-Node: Comparing Protocols27290
-Node: File /inet/tcp27823
-Node: File /inet/udp28849
-Node: TCP Connecting29947
-Node: Troubleshooting32285
-Ref: Troubleshooting-Footnote-135337
-Node: Interacting35906
-Node: Setting Up38636
-Node: Email42130
-Node: Web page44456
-Ref: Web page-Footnote-147261
-Node: Primitive Service47458
-Node: Interacting Service50192
-Ref: Interacting Service-Footnote-159321
-Node: CGI Lib59353
-Node: Simple Server66314
-Ref: Simple Server-Footnote-174037
-Node: Caveats74138
-Node: Challenges75281
-Node: Some Applications and Techniques83960
-Node: PANIC86417
-Node: GETURL88135
-Node: REMCONF90758
-Node: URLCHK96234
-Node: WEBGRAB100069
-Node: STATIST104519
-Ref: STATIST-Footnote-1116227
-Node: MAZE116672
-Node: MOBAGWHO122856
-Ref: MOBAGWHO-Footnote-1136800
-Node: STOXPRED136855
-Node: PROTBASE151110
-Node: Links164191
-Node: GNU Free Documentation License167625
-Node: Index192764
+Node: Comparing Protocols27287
+Node: File /inet/tcp27820
+Node: File /inet/udp28846
+Node: TCP Connecting29944
+Node: Troubleshooting32282
+Ref: Troubleshooting-Footnote-135334
+Node: Interacting35903
+Node: Setting Up38633
+Node: Email42127
+Node: Web page44453
+Ref: Web page-Footnote-147258
+Node: Primitive Service47455
+Node: Interacting Service50189
+Ref: Interacting Service-Footnote-159318
+Node: CGI Lib59350
+Node: Simple Server66311
+Ref: Simple Server-Footnote-174034
+Node: Caveats74135
+Node: Challenges75278
+Node: Some Applications and Techniques83957
+Node: PANIC86414
+Node: GETURL88132
+Node: REMCONF90755
+Node: URLCHK96231
+Node: WEBGRAB100066
+Node: STATIST104516
+Ref: STATIST-Footnote-1116224
+Node: MAZE116669
+Node: MOBAGWHO122853
+Ref: MOBAGWHO-Footnote-1136797
+Node: STOXPRED136852
+Node: PROTBASE151107
+Node: Links164188
+Node: GNU Free Documentation License167622
+Node: Index192761
 
 End Tag Table
diff --git a/doc/gawkinet.texi b/doc/gawkinet.texi
index eb0f2d81..40198e1d 100644
--- a/doc/gawkinet.texi
+++ b/doc/gawkinet.texi
@@ -597,7 +597,7 @@ is started, @command{gawk} creates the appropriate network
 connection, and then two-way I/O proceeds as usual.
 
 @c last comma is part of see-also
-@cindex input/output, two-way, See Also @command{gawk}, networking
+@cindex input/output, two-way, See Also @command{gawk}@comma{} networking
 @cindex TCP/IP, sockets and
 At the C, C++, and Perl level, networking is accomplished
 via @dfn{sockets}, an Application Programming Interface (API) originally
@@ -1144,9 +1144,9 @@ or the application cannot tolerate virtual circuit overhead.
 @node Setting Up, Email, Interacting, Using Networking
 @section Setting Up a Service
 @c last comma is part of tertiary
-@cindex networks, @command{gawk} and, service, establishing
+@cindex networks, @command{gawk} and, service@comma{} establishing
 @c last comma is part of tertiary
-@cindex @command{gawk}, networking, service, establishing
+@cindex @command{gawk}, networking, service@comma{} establishing
 The preceding programs behaved as clients that connect to a server somewhere
 on the Internet and request a particular service. Now we set up such a
 service to mimic the behavior of the @samp{daytime} service.
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 09502879..a1c3aa24 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -1228,7 +1228,7 @@ and the program ``the @command{awk} utility.''
 This @value{DOCUMENT} explains
 both how to write programs in the @command{awk} language and how to
 run the @command{awk} utility.
-The term @dfn{@command{awk} program} refers to a program written by you in
+The term ``@command{awk} program'' refers to a program written by you in
 the @command{awk} programming language.
 
 @cindex @command{gawk}, @command{awk} and
@@ -3266,7 +3266,7 @@ multibyte characters. This option is an easy way to tell @command{gawk}:
 
 @item -c
 @itemx --traditional
-@cindex @code{--c} option
+@cindex @code{-c} option
 @cindex @code{--traditional} option
 @cindex compatibility mode (@command{gawk}), specifying
 Specify @dfn{compatibility mode}, in which the GNU extensions to
@@ -3561,7 +3561,7 @@ can't access your system (other than the specified input data file).
 
 @item -t
 @itemx --lint-old
-@cindex @code{--L} option
+@cindex @code{-L} option
 @cindex @code{--lint-old} option
 Warn about constructs that are not available in the original version of
 @command{awk} from Version 7 Unix
@@ -8481,8 +8481,8 @@ Redirections in @command{awk} are written just like redirections in shell
 commands, except that they are written inside the @command{awk} program.
 
 @c the commas here are part of the see also
-@cindex @code{print} statement, See Also redirection, of output
-@cindex @code{printf} statement, See Also redirection, of output
+@cindex @code{print} statement, See Also redirection@comma{} of output
+@cindex @code{printf} statement, See Also redirection@comma{} of output
 There are four forms of output redirection: output to a file, output
 appended to a file, output through a pipe to another command, and output
 to a coprocess.  They are all shown for the @code{print} statement,
@@ -19793,7 +19793,7 @@ use @code{getopt()} to process their arguments.
 @c STARTOFRANGE libfudata
 @cindex libraries of @command{awk} functions, user database, reading
 @c STARTOFRANGE flibudata
-@cindex functions, library, user database, reading
+@cindex functions, library, user database@comma{} reading
 @c STARTOFRANGE udatar
 @cindex user database@comma{} reading
 @c STARTOFRANGE dataur
@@ -20161,7 +20161,7 @@ uses these functions.
 @c STARTOFRANGE libfgdata
 @cindex libraries of @command{awk} functions, group database, reading
 @c STARTOFRANGE flibgdata
-@cindex functions, library, group database, reading
+@cindex functions, library, group database@comma{} reading
 @c STARTOFRANGE gdatar
 @cindex group database, reading
 @c STARTOFRANGE datagr
@@ -24100,7 +24100,7 @@ It contains the following chapters:
 
 @node Advanced Features
 @chapter Advanced Features of @command{gawk}
-@cindex advanced features, network connections, See Also networks, connections
+@cindex advanced features, network connections, See Also networks@comma{} connections
 @c STARTOFRANGE gawadv
 @cindex @command{gawk}, features, advanced
 @c STARTOFRANGE advgaw
@@ -33769,7 +33769,7 @@ helping David Trueman, and as the primary maintainer since around 1994.
 @appendix Installing @command{gawk}
 
 @c last two commas are part of see also
-@cindex operating systems, See Also GNU/Linux, PC operating systems, Unix
+@cindex operating systems, See Also GNU/Linux@comma{} PC operating systems@comma{} Unix
 @c STARTOFRANGE gligawk
 @cindex @command{gawk}, installing
 @c STARTOFRANGE ingawk
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 704d6645..174e4aba 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{2014-01-16.10}
+\def\texinfoversion{2014-01-30.15}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4649,6 +4649,16 @@ end
   \definedummyword\verb
   \definedummyword\w
   \definedummyword\xref
+  %
+  % Consider:
+  %   @macro mkind{arg1,arg2}
+  %   @cindex \arg2\
+  %   @end macro
+  %   @mkind{foo, bar}
+  % The space after the comma will end up in the temporary definition
+  % that we make for arg2 (see \parsemargdef ff.).  We want all this to be
+  % expanded for the sake of the index, so we end up just seeing "bar".
+  \let\xeatspaces = \eatspaces
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
@@ -7474,7 +7484,7 @@ end
 
 % Parse the optional {params} list.  Set up \paramno and \paramlist
 % so \defmacro knows what to do.  Define \macarg.BLAH for each BLAH
-% in the params list to some hook where the argument si to be expanded.  If
+% in the params list to some hook where the argument is to be expanded.  If
 % there are less than 10 arguments that hook is to be replaced by ##N where N
 % is the position in that list, that is to say the macro arguments are to be
 % defined `a la TeX in the macro body.  
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 5f75283f..404bcb68 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-03   Scott Deifik  <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst: Include original test/Makefile.in lines as
+	comments.
+
 2014-01-28  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.tst (strftime): Pass the value of 'date' command
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index e843eaa7..cab49423 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -431,12 +431,10 @@ nonl::
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 strftime::
-	@echo This test could fail on slow machines or on a minute boundary,
-	@echo so if it does, double check the actual results:
 	@echo $@
 #	@GAWKLOCALE=C; export GAWKLOCALE; \
 #	TZ=GMT0; export TZ; \
-#	(LC_ALL=C date) | $(AWK) -v OUTPUT=_$@ -f "$(srcdir)"/strftime.awk
+#	$(AWK) -v OUTPUT=_$@ -f "$(srcdir)"/strftime.awk
 	@GAWKLOCALE=C; export GAWKLOCALE; \
 	TZ=GMT0; export TZ; \
 	$(AWK) -v OUTPUT=_$@ -v DATECMD="$(DATE)" -f "$(srcdir)"/strftime.awk
@@ -1026,8 +1024,8 @@ inplace3::
 
 testext::
 	@echo $@
-#	@$(AWK) '/^(@load|BEGIN)/,/^}/' $(top_srcdir)/extension/testext.c > testext.awk
-	@$(AWK) ' /^(@load|BEGIN)/,/^}/' $(top_srcdir)/extension/testext.c > testext.awk
+#	@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
+	@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
 	@$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
 
@@ -1038,12 +1036,14 @@ readdir:
 	fi
 	@echo $@
 	@echo This test may fail on MinGW if $(LS) does not report full Windows file index as the inode
-	@$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@
+	@$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@
+#	@ls -afi "$(top_srcdir)" > _dirlist
 	@$(LS) -afi "$(top_srcdir)" > _dirlist
+#	@ls -lna "$(top_srcdir)" | sed 1d > _longlist
 	@$(LS) -lna "$(top_srcdir)" | sed 1d > _longlist
 	@$(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@  \
 		-v dirlist=_dirlist -v longlist=_longlist > $@.ok
-	@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
+	@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ _dirlist _longlist
 
 fts:
 	@case `uname` in \
@@ -1056,6 +1056,7 @@ fts:
 	esac
 	@echo $@
 	@echo Expect $@ to fail with MinGW because function 'fts' is not defined.
+#	@$(AWK) -f "$(srcdir)"/fts.awk
 	@$(AWK) -f "$(srcdir)"/fts.awk || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
 
@@ -1130,7 +1131,6 @@ backsmalls2:
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
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
 }