Lots more documentation fixes.

6 files changed, 24 insertions, 34 deletions

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/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
 }