diff options
| -rw-r--r-- | extension/ChangeLog | 1 | ||||
| -rw-r--r-- | extension/gawkfts.c | 11 | ||||
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rwxr-xr-x | test/jarebug.sh | 2 |
6 files changed, 22 insertions, 3 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 1d85469d..6704ec30 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -4,6 +4,7 @@ Makefile for MirBSD, since the extensions can't be built on MirBSD. * configure: Regenerated. * Makefile.am (check-for-shared-lib-support): Update comment some. + * gawkfts.c (MAX): Provide for systems that don't (Solaris). 2013-03-04 Arnold D. Robbins <arnold@skeeve.com> diff --git a/extension/gawkfts.c b/extension/gawkfts.c index 250b13c0..734dd7f7 100644 --- a/extension/gawkfts.c +++ b/extension/gawkfts.c @@ -71,6 +71,17 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif */ +#ifndef MAX +static int MAX(int x, int y) +{ + if (x > y) + return x; + + return y; +} +#endif + + static FTSENT *fts_alloc(FTS *, const char *, size_t); static FTSENT *fts_build(FTS *, int); static void fts_free(FTSENT *); diff --git a/test/ChangeLog b/test/ChangeLog index 031bbd1d..5a377399 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2013-03-20 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (readdir): Add -a to ls options. -f does not + automatically mean -a on all systems. + * jarebug.sh: Send error output of locale to /dev/null in case + it doesn't exist. + 2013-03-11 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (colonwarn): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 1859932e..64823b5f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1757,7 +1757,7 @@ testext:: readdir: @echo $@ @$(AWK) -f $(srcdir)/readdir.awk $(top_srcdir) > _$@ - @ls -fli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok + @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: diff --git a/test/Makefile.in b/test/Makefile.in index f320a720..b7b443d0 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2137,7 +2137,7 @@ testext:: readdir: @echo $@ @$(AWK) -f $(srcdir)/readdir.awk $(top_srcdir) > _$@ - @ls -fli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok + @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: diff --git a/test/jarebug.sh b/test/jarebug.sh index dcc73e6c..6dc728a6 100755 --- a/test/jarebug.sh +++ b/test/jarebug.sh @@ -11,7 +11,7 @@ cp $infile $out # set up default for locale in ja_JP.EUC-JP ja_JP.eucJP do - if locale -a | grep $locale > /dev/null + if locale -a 2>/dev/null | grep $locale > /dev/null then LANG=$locale LC_ALL=$locale |