[gawk-diffs] [SCM] gawk branch, porting, updated. a156fcf57a3739e9589163a3641058586bab244e

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, porting has been updated
       via  a156fcf57a3739e9589163a3641058586bab244e (commit)
      from  13b8d9034b58c51e06c05c70fe89a34ad1c7dcd9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=a156fcf57a3739e9589163a3641058586bab244e

commit a156fcf57a3739e9589163a3641058586bab244e
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 20 22:30:37 2013 +0200

    Further portability fixes in extensions, tests.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 1d85469..6704ec3 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     <address@hidden>
 
diff --git a/extension/gawkfts.c b/extension/gawkfts.c
index 250b13c..734dd7f 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 031bbd1..5a37739 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-20         Arnold D. Robbins     <address@hidden>
+
+       * 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     <address@hidden>
 
        * Makefile.am (colonwarn): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1859932..64823b5 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=_$@ > address@hidden
+       @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v 
extout=_$@ > address@hidden
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
 fts:
diff --git a/test/Makefile.in b/test/Makefile.in
index f320a72..b7b443d 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=_$@ > address@hidden
+       @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v 
extout=_$@ > address@hidden
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
 fts:
diff --git a/test/jarebug.sh b/test/jarebug.sh
index dcc73e6..6dc728a 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

-----------------------------------------------------------------------

Summary of changes:
 extension/ChangeLog |    1 +
 extension/gawkfts.c |   11 +++++++++++
 test/ChangeLog      |    7 +++++++
 test/Makefile.am    |    2 +-
 test/Makefile.in    |    2 +-
 test/jarebug.sh     |    2 +-
 6 files changed, 22 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
gawk