diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2010-07-16 13:14:38 +0300 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2010-07-16 13:14:38 +0300 |
commit | fae4762eba9ff7bb466a600130e9c90eaac6b0bc (patch) | |
tree | 62711fe7cd511824b5f8a90ba1ba7b523d42e127 /awklib/eg | |
parent | bc70de7b3302d5a81515b901cae376b8b51d2004 (diff) | |
download | egawk-fae4762eba9ff7bb466a600130e9c90eaac6b0bc.tar.gz egawk-fae4762eba9ff7bb466a600130e9c90eaac6b0bc.tar.bz2 egawk-fae4762eba9ff7bb466a600130e9c90eaac6b0bc.zip |
Move to gawk-3.1.1.
Diffstat (limited to 'awklib/eg')
-rw-r--r-- | awklib/eg/lib/getopt.awk | 2 | ||||
-rw-r--r-- | awklib/eg/lib/grcat.c | 9 | ||||
-rw-r--r-- | awklib/eg/lib/libintl.awk | 5 | ||||
-rw-r--r-- | awklib/eg/lib/round.awk | 2 | ||||
-rw-r--r-- | awklib/eg/prog/wordfreq.awk | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/awklib/eg/lib/getopt.awk b/awklib/eg/lib/getopt.awk index 93753052..4f2686d6 100644 --- a/awklib/eg/lib/getopt.awk +++ b/awklib/eg/lib/getopt.awk @@ -6,7 +6,7 @@ # Revised: May, 1993 # External variables: -# Optind -- index in ARGV of first non-option argument +# Optind -- index in ARGV of first nonoption argument # Optarg -- string value of argument to current option # Opterr -- if nonzero, print our own diagnostic # Optopt -- current option letter diff --git a/awklib/eg/lib/grcat.c b/awklib/eg/lib/grcat.c index d34ddd56..802aa639 100644 --- a/awklib/eg/lib/grcat.c +++ b/awklib/eg/lib/grcat.c @@ -8,6 +8,14 @@ * Public Domain */ +/* For OS/2, do nothing. */ +#if HAVE_CONFIG_H +#include <config.h> +#endif + +#ifndef HAVE_GETPGRENT +int main() { exit(0); } +#else #include <stdio.h> #include <grp.h> @@ -32,3 +40,4 @@ char **argv; endgrent(); exit(0); } +#endif /* HAVE_GETPGRENT */ diff --git a/awklib/eg/lib/libintl.awk b/awklib/eg/lib/libintl.awk index a9402c2a..7efd2b47 100644 --- a/awklib/eg/lib/libintl.awk +++ b/awklib/eg/lib/libintl.awk @@ -7,3 +7,8 @@ function dcgettext(string, domain, category) { return string } + +function dcngettext(string1, string2, number, domain, category) +{ + return (number == 1 ? string1 : string2) +} diff --git a/awklib/eg/lib/round.awk b/awklib/eg/lib/round.awk index bf16c2b6..55ef7dc2 100644 --- a/awklib/eg/lib/round.awk +++ b/awklib/eg/lib/round.awk @@ -1,4 +1,4 @@ -# round --- do normal rounding +# round.awk --- do normal rounding # # Arnold Robbins, arnold@gnu.org, Public Domain # August, 1996 diff --git a/awklib/eg/prog/wordfreq.awk b/awklib/eg/prog/wordfreq.awk index 62db5cfa..f364c752 100644 --- a/awklib/eg/prog/wordfreq.awk +++ b/awklib/eg/prog/wordfreq.awk @@ -13,7 +13,7 @@ END { printf "%s\t%d\n", word, freq[word] } END { - sort = "sort +1 -nr" + sort = "sort -k 2nr" for (word in freq) printf "%s\t%d\n", word, freq[word] | sort close(sort) |