4 files changed, 22 insertions, 26 deletions
diff --git a/awklib/eg/prog/cut.awk b/awklib/eg/prog/cut.awk
index 1399411e..09ba1f7c 100644
--- a/awklib/eg/prog/cut.awk
+++ b/awklib/eg/prog/cut.awk
@@ -43,7 +43,7 @@ BEGIN    \
             if (FS == " ")    # defeat awk semantics
                 FS = "[ ]"
         } else if (c == "s")
-            suppress++
+            suppress = 1
         else
             usage()
     }
diff --git a/awklib/eg/prog/egrep.awk b/awklib/eg/prog/egrep.awk
index 56d199c8..86b3cfda 100644
--- a/awklib/eg/prog/egrep.awk
+++ b/awklib/eg/prog/egrep.awk
@@ -90,9 +90,7 @@ function endfile(file)
 }
 END    \
 {
-    if (total == 0)
-        exit 1
-    exit 0
+    exit (total == 0)
 }
 function usage(    e)
 {
diff --git a/awklib/eg/prog/id.awk b/awklib/eg/prog/id.awk
index 8b60a245..cf744447 100644
--- a/awklib/eg/prog/id.awk
+++ b/awklib/eg/prog/id.awk
@@ -5,6 +5,7 @@
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 # Revised February 1996
+# Revised May 2014
 
 # output is:
 # uid=12(foo) euid=34(bar) gid=3(baz) \
@@ -19,34 +20,26 @@ BEGIN    \
 
     printf("uid=%d", uid)
     pw = getpwuid(uid)
-    if (pw != "") {
-        split(pw, a, ":")
-        printf("(%s)", a[1])
-    }
+    if (pw != "")
+        pr_first_field(pw)
 
     if (euid != uid) {
         printf(" euid=%d", euid)
         pw = getpwuid(euid)
-        if (pw != "") {
-            split(pw, a, ":")
-            printf("(%s)", a[1])
-        }
+        if (pw != "")
+            pr_first_field(pw)
     }
 
     printf(" gid=%d", gid)
     pw = getgrgid(gid)
-    if (pw != "") {
-        split(pw, a, ":")
-        printf("(%s)", a[1])
-    }
+    if (pw != "")
+        pr_first_field(pw)
 
     if (egid != gid) {
         printf(" egid=%d", egid)
         pw = getgrgid(egid)
-        if (pw != "") {
-            split(pw, a, ":")
-            printf("(%s)", a[1])
-        }
+        if (pw != "")
+            pr_first_field(pw)
     }
 
     for (i = 1; ("group" i) in PROCINFO; i++) {
@@ -55,13 +48,17 @@ BEGIN    \
         group = PROCINFO["group" i]
         printf("%d", group)
         pw = getgrgid(group)
-        if (pw != "") {
-            split(pw, a, ":")
-            printf("(%s)", a[1])
-        }
+        if (pw != "")
+            pr_first_field(pw)
         if (("group" (i+1)) in PROCINFO)
             printf(",")
     }
 
     print ""
 }
+
+function pr_first_field(str,  a)
+{
+    split(str, a, ":")
+    printf("(%s)", a[1])
+}
diff --git a/awklib/eg/prog/split.awk b/awklib/eg/prog/split.awk
index c907530b..bcc73ae6 100644
--- a/awklib/eg/prog/split.awk
+++ b/awklib/eg/prog/split.awk
@@ -4,8 +4,9 @@
 #
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
+# Revised slightly, May 2014
 
-# usage: split [-num] [file] [outname]
+# usage: split [-count] [file] [outname]
 
 BEGIN {
     outfile = "x"    # default
@@ -14,7 +15,7 @@ BEGIN {
         usage()
 
     i = 1
-    if (ARGV[i] ~ /^-[[:digit:]]+$/) {
+    if (i in ARGV && ARGV[i] ~ /^-[[:digit:]]+$/) {
         count = -ARGV[i]
         ARGV[i] = ""
         i++