diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2016-02-18 22:05:17 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-02-18 22:05:17 +0200 |
| commit | 2f7cba8569fa684e0147c934bc36541538386018 (patch) | |
| tree | 8d377b3fc0209a88f9bf9df30f1798042c6336e8 /awklib | |
| parent | d72ecc9b4250d05b7ed635815515c3816fbde8fb (diff) | |
| parent | 7744707de0e95e1e0009204a7d4886d69db24530 (diff) | |
| download | egawk-2f7cba8569fa684e0147c934bc36541538386018.tar.gz egawk-2f7cba8569fa684e0147c934bc36541538386018.tar.bz2 egawk-2f7cba8569fa684e0147c934bc36541538386018.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'awklib')
| -rw-r--r-- | awklib/eg/prog/cut.awk | 4 | ||||
| -rw-r--r-- | awklib/eg/prog/wc.awk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/awklib/eg/prog/cut.awk b/awklib/eg/prog/cut.awk index 080279bc..fd77910d 100644 --- a/awklib/eg/prog/cut.awk +++ b/awklib/eg/prog/cut.awk @@ -35,7 +35,7 @@ BEGIN { " for delimiter\n", Optarg) > "/dev/stderr" Optarg = substr(Optarg, 1, 1) } - FS = Optarg + fs = FS = Optarg OFS = FS if (FS == " ") # defeat awk semantics FS = "[ ]" @@ -123,7 +123,7 @@ function set_charlist( field, i, j, f, g, n, m, t, nfields = j - 1 } { - if (by_fields && suppress && index($0, FS) == 0) + if (by_fields && suppress && index($0, fs) == 0) next for (i = 1; i <= nfields; i++) { diff --git a/awklib/eg/prog/wc.awk b/awklib/eg/prog/wc.awk index 95940ae4..c46d0984 100644 --- a/awklib/eg/prog/wc.awk +++ b/awklib/eg/prog/wc.awk @@ -30,7 +30,7 @@ BEGIN { if (! do_lines && ! do_words && ! do_chars) do_lines = do_words = do_chars = 1 - print_total = (ARGC - i > 2) + print_total = (ARGC - i > 1) } function beginfile(file) { |