Merge remote-tracking branch 'origin/master' into select

23 files changed, 104 insertions, 58 deletions

diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index 6ef0bbde..13d6b090 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (stamp-eg): Use explicit ./extract.awk to avoid
+	assumptions about AWKPATH in the environment.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index 87ee96b8..c1d58780 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -66,7 +66,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
 	rm -fr eg && \
 	rm -fr stamp-eg && \
-	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	$(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
 	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
 	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
 
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 38124fad..cb8097bf 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -653,7 +653,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
 	rm -fr eg && \
 	rm -fr stamp-eg && \
-	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	$(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
 	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
 	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
 
diff --git a/awklib/eg/lib/ctime.awk b/awklib/eg/lib/ctime.awk
index ca750370..cea25b7a 100644
--- a/awklib/eg/lib/ctime.awk
+++ b/awklib/eg/lib/ctime.awk
@@ -4,7 +4,8 @@
 
 function ctime(ts,    format)
 {
-    format = PROCINFO["strftime"]
+    format = "%a %b %e %H:%M:%S %Z %Y"
+
     if (ts == 0)
         ts = systime()       # use current time as default
     return strftime(format, ts)
diff --git a/awklib/eg/lib/div.awk b/awklib/eg/lib/div.awk
index 9d919288..5939024d 100644
--- a/awklib/eg/lib/div.awk
+++ b/awklib/eg/lib/div.awk
@@ -4,7 +4,7 @@
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # July, 2014
 
-function div(numerator, denominator, result,    i)
+function div(numerator, denominator, result)
 {
     split("", result)
 
diff --git a/awklib/eg/lib/ftrans.awk b/awklib/eg/lib/ftrans.awk
index 1709ac82..2fec27ef 100644
--- a/awklib/eg/lib/ftrans.awk
+++ b/awklib/eg/lib/ftrans.awk
@@ -12,4 +12,4 @@ FNR == 1 {
     beginfile(FILENAME)
 }
 
-END  { endfile(_filename_) }
+END { endfile(_filename_) }
diff --git a/awklib/eg/lib/gettime.awk b/awklib/eg/lib/gettime.awk
index 3da9c8ab..4cb56330 100644
--- a/awklib/eg/lib/gettime.awk
+++ b/awklib/eg/lib/gettime.awk
@@ -31,7 +31,7 @@ function getlocaltime(time,    ret, now, i)
     now = systime()
 
     # return date(1)-style output
-    ret = strftime(PROCINFO["strftime"], now)
+    ret = strftime("%a %b %e %H:%M:%S %Z %Y", now)
 
     # clear out target array
     delete time
diff --git a/awklib/eg/lib/groupawk.in b/awklib/eg/lib/groupawk.in
index 9382bce8..54a27f3d 100644
--- a/awklib/eg/lib/groupawk.in
+++ b/awklib/eg/lib/groupawk.in
@@ -38,8 +38,7 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
         n = split($4, a, "[ \t]*,[ \t]*")
         for (i = 1; i <= n; i++)
             if (a[i] in _gr_groupsbyuser)
-                _gr_groupsbyuser[a[i]] = \
-                    _gr_groupsbyuser[a[i]] " " $1
+                _gr_groupsbyuser[a[i]] = gr_groupsbyuser[a[i]] " " $1
             else
                 _gr_groupsbyuser[a[i]] = $1
 
diff --git a/awklib/eg/lib/noassign.awk b/awklib/eg/lib/noassign.awk
index 1f750edf..99227b37 100644
--- a/awklib/eg/lib/noassign.awk
+++ b/awklib/eg/lib/noassign.awk
@@ -7,7 +7,7 @@
 function disable_assigns(argc, argv,    i)
 {
     for (i = 1; i < argc; i++)
-        if (argv[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/)
+        if (argv[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/)
             argv[i] = ("./" argv[i])
 }
 
diff --git a/awklib/eg/lib/processarray.awk b/awklib/eg/lib/processarray.awk
new file mode 100644
index 00000000..79a86d1f
--- /dev/null
+++ b/awklib/eg/lib/processarray.awk
@@ -0,0 +1,12 @@
+function process_array(arr, name, process, do_arrays,   i, new_name)
+{
+    for (i in arr) {
+        new_name = (name "[" i "]")
+        if (isarray(arr[i])) {
+            if (do_arrays)
+                @process(new_name, arr[i])
+            process_array(arr[i], new_name, process, do_arrays)
+        } else
+            @process(new_name, arr[i])
+    }
+}
diff --git a/awklib/eg/lib/quicksort.awk b/awklib/eg/lib/quicksort.awk
index 43357ac6..3ba2d6e3 100644
--- a/awklib/eg/lib/quicksort.awk
+++ b/awklib/eg/lib/quicksort.awk
@@ -26,7 +26,7 @@ function quicksort(data, left, right, less_than,    i, last)
 
 # quicksort_swap --- helper function for quicksort, should really be inline
 
-function quicksort_swap(data, i, j, temp)
+function quicksort_swap(data, i, j,      temp)
 {
     temp = data[i]
     data[i] = data[j]
diff --git a/awklib/eg/lib/readable.awk b/awklib/eg/lib/readable.awk
index 6942dcca..37970a82 100644
--- a/awklib/eg/lib/readable.awk
+++ b/awklib/eg/lib/readable.awk
@@ -6,7 +6,7 @@
 
 BEGIN {
     for (i = 1; i < ARGC; i++) {
-        if (ARGV[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/ \
+        if (ARGV[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/ \
             || ARGV[i] == "-" || ARGV[i] == "/dev/stdin")
             continue    # assignment or standard input
         else if ((getline junk < ARGV[i]) < 0) # unreadable
diff --git a/awklib/eg/lib/shellquote.awk b/awklib/eg/lib/shellquote.awk
new file mode 100644
index 00000000..cd943dc7
--- /dev/null
+++ b/awklib/eg/lib/shellquote.awk
@@ -0,0 +1,22 @@
+# shell_quote --- quote an argument for passing to the shell
+#
+# Michael Brennan
+# brennan@madronabluff.com
+# September 2014
+
+function shell_quote(s,             # parameter
+    SINGLE, QSINGLE, i, X, n, ret)  # locals
+{
+    if (s == "")
+        return "\"\""
+
+    SINGLE = "\x27"  # single quote
+    QSINGLE = "\"\x27\""
+    n = split(s, X, SINGLE)
+
+    ret = SINGLE X[1] SINGLE
+    for (i = 2; i <= n; i++)
+        ret = ret QSINGLE SINGLE X[i] SINGLE
+
+    return ret
+}
diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk
index f82c89c5..cd56a449 100644
--- a/awklib/eg/lib/strtonum.awk
+++ b/awklib/eg/lib/strtonum.awk
@@ -51,7 +51,7 @@ function mystrtonum(str,        ret, n, i, k, c)
 #     a[5] = "123.45"
 #     a[6] = "1.e3"
 #     a[7] = "1.32"
-#     a[7] = "1.32E2"
+#     a[8] = "1.32E2"
 # 
 #     for (i = 1; i in a; i++)
 #         print a[i], strtonum(a[i]), mystrtonum(a[i])
diff --git a/awklib/eg/misc/arraymax.awk b/awklib/eg/misc/arraymax.awk
index 20dd1768..64197f56 100644
--- a/awklib/eg/misc/arraymax.awk
+++ b/awklib/eg/misc/arraymax.awk
@@ -1,10 +1,10 @@
 {
-  if ($1 > max)
-    max = $1
-  arr[$1] = $0
+    if ($1 > max)
+        max = $1
+    arr[$1] = $0
 }
 
 END {
-  for (x = 1; x <= max; x++)
-    print arr[x]
+    for (x = 1; x <= max; x++)
+        print arr[x]
 }
diff --git a/awklib/eg/misc/findpat.awk b/awklib/eg/misc/findpat.awk
index e9bef9ea..9d799434 100644
--- a/awklib/eg/misc/findpat.awk
+++ b/awklib/eg/misc/findpat.awk
@@ -1,10 +1,9 @@
 {
-       if ($1 == "FIND")
-         regex = $2
-       else {
-         where = match($0, regex)
-         if (where != 0)
-           print "Match of", regex, "found at",
-                     where, "in", $0
+    if ($1 == "FIND")
+        regex = $2
+    else {
+        where = match($0, regex)
+        if (where != 0)
+            print "Match of", regex, "found at", where, "in", $0
        }
 }
diff --git a/awklib/eg/prog/cut.awk b/awklib/eg/prog/cut.awk
index 56e35e71..080279bc 100644
--- a/awklib/eg/prog/cut.awk
+++ b/awklib/eg/prog/cut.awk
@@ -12,12 +12,10 @@
 #
 # Requires getopt() and join() library functions
 
-function usage(    e1, e2)
+function usage()
 {
-    e1 = "usage: cut [-f list] [-d c] [-s] [files...]"
-    e2 = "usage: cut [-c list] [files...]"
-    print e1 > "/dev/stderr"
-    print e2 > "/dev/stderr"
+    print("usage: cut [-f list] [-d c] [-s] [files...]") > "/dev/stderr"
+    print("usage: cut [-c list] [files...]") > "/dev/stderr"
     exit 1
 }
 BEGIN {
diff --git a/awklib/eg/prog/egrep.awk b/awklib/eg/prog/egrep.awk
index 094bdea5..a4165a90 100644
--- a/awklib/eg/prog/egrep.awk
+++ b/awklib/eg/prog/egrep.awk
@@ -91,10 +91,9 @@ function endfile(file)
 END {
     exit (total == 0)
 }
-function usage(    e)
+function usage()
 {
-    e = "Usage: egrep [-csvil] [-e pat] [files ...]"
-    e = e "\n\tegrep [-csvil] pat [files ...]"
-    print e > "/dev/stderr"
+    print("Usage: egrep [-csvil] [-e pat] [files ...]") > "/dev/stderr"
+    print("\n\tegrep [-csvil] pat [files ...]") > "/dev/stderr"
     exit 1
 }
diff --git a/awklib/eg/prog/extract.awk b/awklib/eg/prog/extract.awk
index 12e30b54..24f40ce5 100644
--- a/awklib/eg/prog/extract.awk
+++ b/awklib/eg/prog/extract.awk
@@ -1,5 +1,4 @@
-# extract.awk --- extract files and run programs
-#                 from texinfo files
+# extract.awk --- extract files and run programs from texinfo files
 #
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
@@ -7,8 +6,7 @@
 
 BEGIN    { IGNORECASE = 1 }
 
-/^@c(omment)?[ \t]+system/    \
-{
+/^@c(omment)?[ \t]+system/ {
     if (NF < 3) {
         e = ("extract: " FILENAME ":" FNR)
         e = (e  ": badly formed `system' line")
@@ -24,8 +22,7 @@ BEGIN    { IGNORECASE = 1 }
         print e > "/dev/stderr"
     }
 }
-/^@c(omment)?[ \t]+file/    \
-{
+/^@c(omment)?[ \t]+file/ {
     if (NF != 3) {
         e = ("extract: " FILENAME ":" FNR ": badly formed `file' line")
         print e > "/dev/stderr"
@@ -66,7 +63,7 @@ BEGIN    { IGNORECASE = 1 }
 function unexpected_eof()
 {
     printf("extract: %s:%d: unexpected EOF or error\n",
-        FILENAME, FNR) > "/dev/stderr"
+                     FILENAME, FNR) > "/dev/stderr"
     exit 1
 }
 
diff --git a/awklib/eg/prog/id.awk b/awklib/eg/prog/id.awk
index 992fa57c..b6061f9b 100644
--- a/awklib/eg/prog/id.awk
+++ b/awklib/eg/prog/id.awk
@@ -6,6 +6,7 @@
 # May 1993
 # Revised February 1996
 # Revised May 2014
+# Revised September 2014
 
 # output is:
 # uid=12(foo) euid=34(bar) gid=3(baz) \
@@ -19,26 +20,22 @@ BEGIN {
 
     printf("uid=%d", uid)
     pw = getpwuid(uid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (euid != uid) {
         printf(" euid=%d", euid)
         pw = getpwuid(euid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     }
 
     printf(" gid=%d", gid)
     pw = getgrgid(gid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (egid != gid) {
         printf(" egid=%d", egid)
         pw = getgrgid(egid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     }
 
     for (i = 1; ("group" i) in PROCINFO; i++) {
@@ -47,8 +44,7 @@ BEGIN {
         group = PROCINFO["group" i]
         printf("%d", group)
         pw = getgrgid(group)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
         if (("group" (i+1)) in PROCINFO)
             printf(",")
     }
@@ -58,6 +54,8 @@ BEGIN {
 
 function pr_first_field(str,  a)
 {
-    split(str, a, ":")
-    printf("(%s)", a[1])
+    if (str != "") {
+        split(str, a, ":")
+        printf("(%s)", a[1])
+    }
 }
diff --git a/awklib/eg/prog/pi.awk b/awklib/eg/prog/pi.awk
new file mode 100644
index 00000000..3297beff
--- /dev/null
+++ b/awklib/eg/prog/pi.awk
@@ -0,0 +1,18 @@
+# pi.awk --- compute the digits of pi
+#
+# Katie Wasserman, katie@wass.net
+# August 2014
+
+BEGIN {
+    digits = 100000
+    two = 2 * 10 ^ digits
+    pi = two
+    for (m = digits * 4; m > 0; --m) {
+        d = m * 2 + 1
+        x = pi * m
+        div(x, d, result)
+        pi = result["quotient"]
+        pi = pi + two
+    }
+    print pi
+}
diff --git a/awklib/eg/prog/split.awk b/awklib/eg/prog/split.awk
index bcc73ae6..6a7198f6 100644
--- a/awklib/eg/prog/split.awk
+++ b/awklib/eg/prog/split.awk
@@ -50,9 +50,8 @@ BEGIN {
     }
     print > out
 }
-function usage(   e)
+function usage()
 {
-    e = "usage: split [-num] [file] [outname]"
-    print e > "/dev/stderr"
+    print("usage: split [-num] [file] [outname]") > "/dev/stderr"
     exit 1
 }
diff --git a/awklib/eg/prog/uniq.awk b/awklib/eg/prog/uniq.awk
index 2a2cf63e..7dd16099 100644
--- a/awklib/eg/prog/uniq.awk
+++ b/awklib/eg/prog/uniq.awk
@@ -5,10 +5,9 @@
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
-function usage(    e)
+function usage()
 {
-    e = "Usage: uniq [-udc [-n]] [+n] [ in [ out ]]"
-    print e > "/dev/stderr"
+    print("Usage: uniq [-udc [-n]] [+n] [ in [ out ]]") > "/dev/stderr"
     exit 1
 }