diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2011-03-25 13:31:01 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2011-03-25 13:31:01 +0200 |
| commit | 4fe569fb78dd1b25822c16c9cac515a0fc6702a4 (patch) | |
| tree | 165759d7f20fd5f0425c4cb0c95b69e4011a2920 /awklib/eg | |
| parent | a3e92aab353cabae2743b78de1f12fe94e66a339 (diff) | |
| download | egawk-4fe569fb78dd1b25822c16c9cac515a0fc6702a4.tar.gz egawk-4fe569fb78dd1b25822c16c9cac515a0fc6702a4.tar.bz2 egawk-4fe569fb78dd1b25822c16c9cac515a0fc6702a4.zip | |
Apply first set of edits to gawk.texi.
Diffstat (limited to 'awklib/eg')
| -rw-r--r-- | awklib/eg/lib/getopt.awk | 2 | ||||
| -rw-r--r-- | awklib/eg/lib/groupawk.in | 3 | ||||
| -rw-r--r-- | awklib/eg/lib/passwdawk.in | 3 | ||||
| -rw-r--r-- | awklib/eg/lib/strtonum.awk | 2 | ||||
| -rw-r--r-- | awklib/eg/prog/alarm.awk | 10 |
5 files changed, 9 insertions, 11 deletions
diff --git a/awklib/eg/lib/getopt.awk b/awklib/eg/lib/getopt.awk index d3dd9c16..0b81aa09 100644 --- a/awklib/eg/lib/getopt.awk +++ b/awklib/eg/lib/getopt.awk @@ -27,7 +27,7 @@ function getopt(argc, argv, options, thisopt, i) Optind++ _opti = 0 return -1 - } else if (argv[Optind] !~ /^-[^: \t\n\f\r\v\b]/) { + } else if (argv[Optind] !~ /^-[^:[:space:]]/) { _opti = 0 return -1 } diff --git a/awklib/eg/lib/groupawk.in b/awklib/eg/lib/groupawk.in index 1331a463..0917b923 100644 --- a/awklib/eg/lib/groupawk.in +++ b/awklib/eg/lib/groupawk.in @@ -49,12 +49,11 @@ function _gr_init( oldfs, oldrs, olddol0, grcat, close(grcat) _gr_count = 0 _gr_inited++ + FS = oldfs if (using_fw) FIELDWIDTHS = FIELDWIDTHS else if (using_fpat) FPAT = FPAT - else - FS = oldfs RS = oldrs $0 = olddol0 } diff --git a/awklib/eg/lib/passwdawk.in b/awklib/eg/lib/passwdawk.in index 4cbbaaf9..d2442adb 100644 --- a/awklib/eg/lib/passwdawk.in +++ b/awklib/eg/lib/passwdawk.in @@ -32,12 +32,11 @@ function _pw_init( oldfs, oldrs, olddol0, pwcat, using_fw, using_fpat) close(pwcat) _pw_count = 0 _pw_inited = 1 + FS = oldfs if (using_fw) FIELDWIDTHS = FIELDWIDTHS else if (using_fpat) FPAT = FPAT - else - FS = oldfs RS = oldrs $0 = olddol0 } diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk index 6b8498a8..a56ab50c 100644 --- a/awklib/eg/lib/strtonum.awk +++ b/awklib/eg/lib/strtonum.awk @@ -1,4 +1,4 @@ -# strtonum --- convert string to number +# mystrtonum --- convert string to number # # Arnold Robbins, arnold@skeeve.com, Public Domain diff --git a/awklib/eg/prog/alarm.awk b/awklib/eg/prog/alarm.awk index af7e8af1..2510c787 100644 --- a/awklib/eg/prog/alarm.awk +++ b/awklib/eg/prog/alarm.awk @@ -22,20 +22,20 @@ BEGIN \ switch (ARGC) { case 5: delay = ARGV[4] + 0 - # fall through + # fall through case 4: count = ARGV[3] + 0 - # fall through + # fall through case 3: message = ARGV[2] - break + break default: if (ARGV[1] !~ /[[:digit:]]?[[:digit:]]:[[:digit:]][[:digit:]]/) { print usage1 > "/dev/stderr" print usage2 > "/dev/stderr" exit 1 - } - break + } + break } # set defaults for once we reach the desired time |