Merge branch 'master' into cmake

12 files changed, 51 insertions, 16 deletions

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/getopt.awk b/awklib/eg/lib/getopt.awk
index db957ceb..6b1f4c50 100644
--- a/awklib/eg/lib/getopt.awk
+++ b/awklib/eg/lib/getopt.awk
@@ -38,8 +38,7 @@ function getopt(argc, argv, options,    thisopt, i)
     i = index(options, thisopt)
     if (i == 0) {
         if (Opterr)
-            printf("%c -- invalid option\n",
-                                  thisopt) > "/dev/stderr"
+            printf("%c -- invalid option\n", thisopt) > "/dev/stderr"
         if (_opti >= length(argv[Optind])) {
             Optind++
             _opti = 0
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 0917b923..54a27f3d 100644
--- a/awklib/eg/lib/groupawk.in
+++ b/awklib/eg/lib/groupawk.in
@@ -5,8 +5,7 @@
 # Revised October 2000
 # Revised December 2010
 
-BEGIN    \
-{
+BEGIN {
     # Change to suit your system
     _gr_awklib = "/usr/local/libexec/awk/"
 }
@@ -39,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 9342e789..cd56a449 100644
--- a/awklib/eg/lib/strtonum.awk
+++ b/awklib/eg/lib/strtonum.awk
@@ -13,8 +13,9 @@ function mystrtonum(str,        ret, n, i, k, c)
         ret = 0
         for (i = 1; i <= n; i++) {
             c = substr(str, i, 1)
-            if ((k = index("01234567", c)) > 0)
-                k-- # adjust for 1-basing in awk
+            # index() returns 0 if c not in string,
+            # includes c == "0"
+            k = index("1234567", c)
 
             ret = ret * 8 + k
         }
@@ -26,6 +27,8 @@ function mystrtonum(str,        ret, n, i, k, c)
         for (i = 1; i <= n; i++) {
             c = substr(str, i, 1)
             c = tolower(c)
+            # index() returns 0 if c not in string,
+            # includes c == "0"
             k = index("123456789abcdef", c)
 
             ret = ret * 16 + k
@@ -48,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])