[gawk-diffs] [SCM] gawk branch, porting, updated. 25178eae557724b85b3ff0cdc296a897c5fc4350

[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  25178eae557724b85b3ff0cdc296a897c5fc4350 (commit)
      from  de74132cd8ee9d3a54c7661f15d787e0b232d328 (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=25178eae557724b85b3ff0cdc296a897c5fc4350

commit 25178eae557724b85b3ff0cdc296a897c5fc4350
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Mar 24 15:17:54 2013 +0200

    More portability: mostly for SGI IRIX.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 6704ec3..ef1aa4d 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-24         Arnold D. Robbins     <address@hidden>
+
+       * gawkdirfd.h: Improve test for doing own dirfd function. Needed
+       for IRIX.
+
 2013-03-20         Arnold D. Robbins     <address@hidden>
 
        * configure.ac: Add AC_OUTPUT_COMMANDS that drops in a do-nothing
diff --git a/extension/gawkdirfd.h b/extension/gawkdirfd.h
index 249a064..1fbd6f5 100644
--- a/extension/gawkdirfd.h
+++ b/extension/gawkdirfd.h
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#if !defined(HAVE_DIRFD) && !defined(HAVE_DECL_DIRFD)
+#if !defined(HAVE_DIRFD) && (!defined(HAVE_DECL_DIRFD) || HAVE_DECL_DIRFD == 0)
 int
 dirfd (DIR *dir_p)
 {
diff --git a/test/ChangeLog b/test/ChangeLog
index 01472c6..0be3826 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -2,6 +2,8 @@
 
        * Makefile.am (readdir): Add a check for GNU/Linux and NFS directory
        and issue a warning if so.
+       (fts): Ditto for IRIX - can't check for NFS so just print the message.
+       (fnmatch.awk, fnmatch.ok): Improve portability.
 
 2013-03-20         Arnold D. Robbins     <address@hidden>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index e5a56ce..cfd4632 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1765,6 +1765,10 @@ readdir:
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
 fts:
+       @if [ "`uname`" = IRIX ];  then \
+       echo This test may fail on IRIX systems when run on an NFS filesystem.; 
\
+       echo If it does, try rerunning on an xfs filesystem. ; \
+       fi
        @echo $@
        @$(AWK) -f $(srcdir)/fts.awk
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
diff --git a/test/Makefile.in b/test/Makefile.in
index 0b8906b..2751ae3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2145,6 +2145,10 @@ readdir:
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
 fts:
+       @if [ "`uname`" = IRIX ];  then \
+       echo This test may fail on IRIX systems when run on an NFS filesystem.; 
\
+       echo If it does, try rerunning on an xfs filesystem. ; \
+       fi
        @echo $@
        @$(AWK) -f $(srcdir)/fts.awk
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
diff --git a/test/fnmatch.awk b/test/fnmatch.awk
index c088507..b371754 100644
--- a/test/fnmatch.awk
+++ b/test/fnmatch.awk
@@ -1,11 +1,13 @@
 @load "fnmatch"
 
 BEGIN {
-       print "FNM_NOMATCH =", FNM_NOMATCH 
        # can't print the values; they vary from system to system
        for (i in FNM)
                printf("\"%s\" is an element in FNM\n", i)
+       # can't even print this
+       # print "FNM_NOMATCH =", FNM_NOMATCH 
 
        printf("fnmatch(\"*.a\", \"foo.a\", 0)  = %d\n", fnmatch("*.a", 
"foo.a", 0) )
-       printf("fnmatch(\"*.a\", \"foo.c\", 0) = %d\n", fnmatch("*.a", "foo.c", 
0))
+       if (fnmatch("*.a", "foo.c", 0) == FNM_NOMATCH)
+               printf("fnmatch(\"*.a\", \"foo.c\", 0) == FNM_NOMATCH\n")
 }
diff --git a/test/fnmatch.ok b/test/fnmatch.ok
index fd8a78c..15bb191 100644
--- a/test/fnmatch.ok
+++ b/test/fnmatch.ok
@@ -1,4 +1,3 @@
-FNM_NOMATCH = 1
 "LEADING_DIR" is an element in FNM
 "CASEFOLD" is an element in FNM
 "NOESCAPE" is an element in FNM
@@ -6,4 +5,4 @@ FNM_NOMATCH = 1
 "PATHNAME" is an element in FNM
 "FILE_NAME" is an element in FNM
 fnmatch("*.a", "foo.a", 0)  = 0
-fnmatch("*.a", "foo.c", 0) = 1
+fnmatch("*.a", "foo.c", 0) == FNM_NOMATCH

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

Summary of changes:
 extension/ChangeLog   |    5 +++++
 extension/gawkdirfd.h |    2 +-
 test/ChangeLog        |    2 ++
 test/Makefile.am      |    4 ++++
 test/Makefile.in      |    4 ++++
 test/fnmatch.awk      |    6 ++++--
 test/fnmatch.ok       |    3 +--
 7 files changed, 21 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk