Re: [Bug-tar] GNU Tar 1.16.1 v. Tru64

[Paul Eggert]

address@hidden (Steven M. Schweda) writes:

>    Only in the sense that I'm working on (Digital/Compaq/HP) Tru64 UNIX,
> not (HP) HP-UX.  Different heritage, different future (none v, some). 

Ah, OK, sorry about the confusion.  I installed this fix into gnulib,
and it should appear in the next tar release.

2007-06-06  Paul Eggert  <address@hidden>

        Work around problem reported by Steven M. Schweda in
        <http://lists.gnu.org/archive/html/bug-tar/2007-06/msg00002.html>:
        Tru64 5.1B with the Compaq compiler environment installed declares
        an 'isblank' function but does not define it in the C library.
        * lib/fnmatch.c (isblank): Check for HAVE_ISBLANK, too.
        * lib/regex_internal.h (isblank): Likewise.
        * m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for isblank existence.
        * m4/regex.m4 (gl_PREREQ_REGEX): Likewise.

Index: lib/fnmatch.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fnmatch.c,v
retrieving revision 1.40
diff -u -p -r1.40 fnmatch.c
--- lib/fnmatch.c       16 Jan 2007 16:31:23 -0000      1.40
+++ lib/fnmatch.c       6 Jun 2007 18:34:09 -0000
@@ -85,7 +85,7 @@ extern int fnmatch (const char *pattern,
 #if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU


-# if ! (defined isblank || HAVE_DECL_ISBLANK)
+# if ! (defined isblank || (HAVE_ISBLANK && HAVE_DECL_ISBLANK))
 #  define isblank(c) ((c) == ' ' || (c) == '\t')
 # endif

Index: lib/regex_internal.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/regex_internal.h,v
retrieving revision 1.32
diff -u -p -r1.32 regex_internal.h
--- lib/regex_internal.h        15 Feb 2007 00:16:55 -0000      1.32
+++ lib/regex_internal.h        6 Jun 2007 18:34:09 -0000
@@ -48,7 +48,7 @@
 #endif

 /* In case that the system doesn't have isblank().  */
-#if !defined _LIBC && !HAVE_DECL_ISBLANK && !defined isblank
+#if !defined _LIBC && ! (defined isblank || (HAVE_ISBLANK && 
HAVE_DECL_ISBLANK))
 # define isblank(ch) ((ch) == ' ' || (ch) == '\t')
 #endif

Index: m4/fnmatch.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/fnmatch.m4,v
retrieving revision 1.29
diff -u -p -r1.29 fnmatch.m4
--- m4/fnmatch.m4       25 Jan 2007 00:43:59 -0000      1.29
+++ m4/fnmatch.m4       6 Jun 2007 18:34:09 -0000
@@ -83,7 +83,7 @@ AC_DEFUN([_AC_LIBOBJ_FNMATCH],
 [AC_REQUIRE([AC_FUNC_ALLOCA])dnl
 AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl
 AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
-AC_CHECK_FUNCS_ONCE([btowc iswctype mbsrtowcs mempcpy wmemchr wmemcpy 
wmempcpy])
+AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy 
wmempcpy])
 AC_CHECK_HEADERS_ONCE([wctype.h])
 AC_LIBOBJ([fnmatch])
 FNMATCH_H=fnmatch.h
Index: m4/regex.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/regex.m4,v
retrieving revision 1.64
diff -u -p -r1.64 regex.m4
--- m4/regex.m4 24 Feb 2007 11:54:07 -0000      1.64
+++ m4/regex.m4 6 Jun 2007 18:34:09 -0000
@@ -206,6 +206,6 @@ AC_DEFUN([gl_PREREQ_REGEX],
 [
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_REQUIRE([AC_C_RESTRICT])
-  AC_CHECK_FUNCS_ONCE([iswctype mbrtowc wcrtomb wcscoll])
+  AC_CHECK_FUNCS_ONCE([isblank iswctype mbrtowc wcrtomb wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])