diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2010-12-20 22:49:15 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2010-12-20 22:49:15 +0200 |
| commit | 14c5019fd055fcf91f333c2bb81627719766a9ba (patch) | |
| tree | 620d71eac652d88fa95b1f01782ad0ac9064afaa /awklib/eg | |
| parent | 1267f2e3fe6b45d62ce933c765aa9b5cdc14074f (diff) | |
| download | egawk-14c5019fd055fcf91f333c2bb81627719766a9ba.tar.gz egawk-14c5019fd055fcf91f333c2bb81627719766a9ba.tar.bz2 egawk-14c5019fd055fcf91f333c2bb81627719766a9ba.zip | |
Doc updates.
Diffstat (limited to 'awklib/eg')
| -rw-r--r-- | awklib/eg/prog/extract.awk | 3 | ||||
| -rw-r--r-- | awklib/eg/prog/igawk.sh | 34 | ||||
| -rw-r--r-- | awklib/eg/prog/labels.awk | 4 |
3 files changed, 22 insertions, 19 deletions
diff --git a/awklib/eg/prog/extract.awk b/awklib/eg/prog/extract.awk index 6f27a707..dc105728 100644 --- a/awklib/eg/prog/extract.awk +++ b/awklib/eg/prog/extract.awk @@ -63,7 +63,8 @@ BEGIN { IGNORECASE = 1 } print join(a, 1, n, SUBSEP) > curfile } } -function unexpected_eof() { +function unexpected_eof() +{ printf("%s:%d: unexpected EOF or error\n", FILENAME, FNR) > "/dev/stderr" exit 1 diff --git a/awklib/eg/prog/igawk.sh b/awklib/eg/prog/igawk.sh index e40568ed..6657e5d8 100644 --- a/awklib/eg/prog/igawk.sh +++ b/awklib/eg/prog/igawk.sh @@ -3,6 +3,7 @@ # # Arnold Robbins, arnold@skeeve.com, Public Domain # July 1993 +# December 2010, minor edits if [ "$1" = debug ] then @@ -21,49 +22,50 @@ opts= while [ $# -ne 0 ] # loop over arguments do case $1 in - --) shift; break;; + --) shift + break ;; -W) shift # The ${x?'message here'} construct prints a # diagnostic if $x is the null string set -- -W"${@?'missing operand'}" - continue;; + continue ;; -[vF]) opts="$opts $1 '${2?'missing operand'}'" - shift;; + shift ;; -[vF]*) opts="$opts '$1'" ;; -f) program="$program$n@include ${2?'missing operand'}" - shift;; + shift ;; - -f*) f=`expr "$1" : '-f\(.*\)'` - program="$program$n@include $f";; + -f*) f=$(expr "$1" : '-f\(.*\)') + program="$program$n@include $f" ;; -[W-]file=*) - f=`expr "$1" : '-.file=\(.*\)'` - program="$program$n@include $f";; + f=$(expr "$1" : '-.file=\(.*\)') + program="$program$n@include $f" ;; -[W-]file) program="$program$n@include ${2?'missing operand'}" - shift;; + shift ;; -[W-]source=*) - t=`expr "$1" : '-.source=\(.*\)'` - program="$program$n$t";; + t=$(expr "$1" : '-.source=\(.*\)') + program="$program$n$t" ;; -[W-]source) program="$program$n${2?'missing operand'}" - shift;; + shift ;; -[W-]version) - echo igawk: version 2.0 1>&2 + echo igawk: version 3.0 1>&2 gawk --version exit 0 ;; -[W-]*) opts="$opts '$1'" ;; - *) break;; + *) break ;; esac shift done @@ -126,8 +128,8 @@ BEGIN { } }' # close quote ends `expand_prog' variable -processed_program=`gawk -- "$expand_prog" /dev/stdin <<EOF +processed_program=$(gawk -- "$expand_prog" /dev/stdin <<EOF $program EOF -` +) eval gawk $opts -- '"$processed_program"' '"$@"' diff --git a/awklib/eg/prog/labels.awk b/awklib/eg/prog/labels.awk index eaab49fc..abf53c3b 100644 --- a/awklib/eg/prog/labels.awk +++ b/awklib/eg/prog/labels.awk @@ -2,6 +2,7 @@ # # Arnold Robbins, arnold@skeeve.com, Public Domain # June 1992 +# December 2010, minor edits # Each label is 5 lines of data that may have blank lines. # The label sheets have 2 blank lines at the top and 2 at @@ -29,8 +30,7 @@ function printpage( i, j) printf "\n\n" # footer - for (i in line) - line[i] = "" + delete line } # main rule |