Merge branch 'master' into comment

7 files changed, 31 insertions, 35 deletions

diff --git a/awklib/eg/prog/alarm.awk b/awklib/eg/prog/alarm.awk
index 9bb1633c..63cf64a4 100644
--- a/awklib/eg/prog/alarm.awk
+++ b/awklib/eg/prog/alarm.awk
@@ -71,7 +71,7 @@ BEGIN    \
     # how long to sleep for
     naptime = target - current
     if (naptime <= 0) {
-        print "time is in the past!" > "/dev/stderr"
+        print "alarm: time is in the past!" > "/dev/stderr"
         exit 1
     }
     # zzzzzz..... go away if interrupted
diff --git a/awklib/eg/prog/cut.awk b/awklib/eg/prog/cut.awk
index 1399411e..04d9bc11 100644
--- a/awklib/eg/prog/cut.awk
+++ b/awklib/eg/prog/cut.awk
@@ -34,7 +34,7 @@ BEGIN    \
             OFS = ""
         } else if (c == "d") {
             if (length(Optarg) > 1) {
-                printf("Using first character of %s" \
+                printf("cut: using first character of %s" \
                        " for delimiter\n", Optarg) > "/dev/stderr"
                 Optarg = substr(Optarg, 1, 1)
             }
@@ -43,7 +43,7 @@ BEGIN    \
             if (FS == " ")    # defeat awk semantics
                 FS = "[ ]"
         } else if (c == "s")
-            suppress++
+            suppress = 1
         else
             usage()
     }
@@ -75,7 +75,7 @@ function set_fieldlist(        n, m, i, j, k, f, g)
         if (index(f[i], "-") != 0) { # a range
             m = split(f[i], g, "-")
             if (m != 2 || g[1] >= g[2]) {
-                printf("bad field list: %s\n",
+                printf("cut: bad field list: %s\n",
                                   f[i]) > "/dev/stderr"
                 exit 1
             }
@@ -96,7 +96,7 @@ function set_charlist(    field, i, j, f, g, n, m, t,
         if (index(f[i], "-") != 0) { # range
             m = split(f[i], g, "-")
             if (m != 2 || g[1] >= g[2]) {
-                printf("bad character list: %s\n",
+                printf("cut: bad character list: %s\n",
                                f[i]) > "/dev/stderr"
                 exit 1
             }
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/extract.awk b/awklib/eg/prog/extract.awk
index dc105728..12e30b54 100644
--- a/awklib/eg/prog/extract.awk
+++ b/awklib/eg/prog/extract.awk
@@ -10,7 +10,7 @@ BEGIN    { IGNORECASE = 1 }
 /^@c(omment)?[ \t]+system/    \
 {
     if (NF < 3) {
-        e = (FILENAME ":" FNR)
+        e = ("extract: " FILENAME ":" FNR)
         e = (e  ": badly formed `system' line")
         print e > "/dev/stderr"
         next
@@ -19,7 +19,7 @@ BEGIN    { IGNORECASE = 1 }
     $2 = ""
     stat = system($0)
     if (stat != 0) {
-        e = (FILENAME ":" FNR)
+        e = ("extract: " FILENAME ":" FNR)
         e = (e ": warning: system returned " stat)
         print e > "/dev/stderr"
     }
@@ -27,7 +27,7 @@ BEGIN    { IGNORECASE = 1 }
 /^@c(omment)?[ \t]+file/    \
 {
     if (NF != 3) {
-        e = (FILENAME ":" FNR ": badly formed `file' line")
+        e = ("extract: " FILENAME ":" FNR ": badly formed `file' line")
         print e > "/dev/stderr"
         next
     }
@@ -65,7 +65,7 @@ BEGIN    { IGNORECASE = 1 }
 }
 function unexpected_eof()
 {
-    printf("%s:%d: unexpected EOF or error\n",
+    printf("extract: %s:%d: unexpected EOF or error\n",
         FILENAME, FNR) > "/dev/stderr"
     exit 1
 }
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/igawk.sh b/awklib/eg/prog/igawk.sh
index 03d1c996..70edf606 100644
--- a/awklib/eg/prog/igawk.sh
+++ b/awklib/eg/prog/igawk.sh
@@ -115,7 +115,7 @@ BEGIN {
             }
             fpath = pathto($2)
             if (fpath == "") {
-                printf("igawk:%s:%d: cannot find %s\n",
+                printf("igawk: %s:%d: cannot find %s\n",
                     input[stackptr], FNR, $2) > "/dev/stderr"
                 continue
             }
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++