4 files changed, 9 insertions, 3 deletions
diff --git a/awklib/eg/lib/ctime.awk b/awklib/eg/lib/ctime.awk
index 0a50d262..f37856c6 100644
--- a/awklib/eg/lib/ctime.awk
+++ b/awklib/eg/lib/ctime.awk
@@ -4,7 +4,7 @@
 
 function ctime(ts,    format)
 {
-    format = "%a %b %d %H:%M:%S %Z %Y"
+    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/groupawk.in b/awklib/eg/lib/groupawk.in
index 899656bd..a9e10e1f 100644
--- a/awklib/eg/lib/groupawk.in
+++ b/awklib/eg/lib/groupawk.in
@@ -20,6 +20,7 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
     oldrs = RS
     olddol0 = $0
     using_fw = (PROCINFO["FS"] == "FIELDWIDTHS")
+    using_fpat = (PROCINFO["FS"] == "FPAT")
     FS = ":"
     RS = "\n"
 
@@ -50,6 +51,8 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
     FS = oldfs
     if (using_fw)
         FIELDWIDTHS = FIELDWIDTHS
+    else if (using_fpat)
+        FPAT = FPAT
     RS = oldrs
     $0 = olddol0
 }
diff --git a/awklib/eg/lib/passwdawk.in b/awklib/eg/lib/passwdawk.in
index 47798ded..323ebf58 100644
--- a/awklib/eg/lib/passwdawk.in
+++ b/awklib/eg/lib/passwdawk.in
@@ -18,6 +18,7 @@ function _pw_init(    oldfs, oldrs, olddol0, pwcat, using_fw)
     oldrs = RS
     olddol0 = $0
     using_fw = (PROCINFO["FS"] == "FIELDWIDTHS")
+    using_fpat = (PROCINFO["FS"] == "FPAT")
     FS = ":"
     RS = "\n"
 
@@ -33,6 +34,8 @@ function _pw_init(    oldfs, oldrs, olddol0, pwcat, using_fw)
     FS = oldfs
     if (using_fw)
         FIELDWIDTHS = FIELDWIDTHS
+    else if (using_fpat)
+        FPAT = FPAT
     RS = oldrs
     $0 = olddol0
 }
diff --git a/awklib/eg/prog/wc.awk b/awklib/eg/prog/wc.awk
index 8fb48164..d51b9ff2 100644
--- a/awklib/eg/prog/wc.awk
+++ b/awklib/eg/prog/wc.awk
@@ -34,14 +34,14 @@ BEGIN {
 }
 function beginfile(file)
 {
-    chars = lines = words = 0
+    lines = words = chars = 0
     fname = FILENAME
 }
 function endfile(file)
 {
-    tchars += chars
     tlines += lines
     twords += words
+    tchars += chars
     if (do_lines)
         printf "\t%d", lines
     if (do_words)