Re: [PATCH] snprintf: port snprintf (NULL, 0, ...) to Solaris 8 and 9

[Bruno Haible]

Hi Paul,

> (gl_PRINTF_SIZES_C99, gl_PRINTF_DIRECTIVE_F, gl_SNPRINTF_RETVAL_C99):
> Fix typo in matching older versions of Solaris: "solaris2.10"
> is matched by the shell pattern "solaris2.[0-9]*".  This matters
> only for guessing while cross-compiling.

There are more occurrences of this problem. Hope I caught them all here:


2010-12-21  Bruno Haible  <address@hidden>

        Fix cross-compilation guesses on Solaris.
        * m4/fopen.m4 (gl_FUNC_FOPEN): Correct shell pattern so that it does
        not match "solaris2.10".
        * m4/open.m4 (gl_FUNC_OPEN): Likewise.
        * m4/printf.m4 (gl_SNPRINTF_TRUNCATION_C99, gl_SNPRINTF_DIRECTIVE_N,
        gl_VSNPRINTF_ZEROSIZE_C99): Likewise.

--- m4/fopen.m4.orig    Tue Dec 21 12:49:45 2010
+++ m4/fopen.m4 Tue Dec 21 12:49:22 2010
@@ -1,4 +1,4 @@
-# fopen.m4 serial 6
+# fopen.m4 serial 7
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@
             [
 changequote(,)dnl
              case "$host_os" in
-               aix* | hpux* | solaris2.[0-9]*)
+               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
                  gl_cv_func_fopen_slash="guessing no" ;;
                *)
                  gl_cv_func_fopen_slash="guessing yes" ;;
--- m4/open.m4.orig     Tue Dec 21 12:49:45 2010
+++ m4/open.m4  Tue Dec 21 12:49:22 2010
@@ -1,4 +1,4 @@
-# open.m4 serial 10
+# open.m4 serial 11
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -44,7 +44,7 @@
             [
 changequote(,)dnl
              case "$host_os" in
-               freebsd* | aix* | hpux* | solaris2.[0-9]*)
+               freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
                  gl_cv_func_open_slash="guessing no" ;;
                *)
                  gl_cv_func_open_slash="guessing yes" ;;
--- m4/printf.m4.orig   Tue Dec 21 12:49:45 2010
+++ m4/printf.m4        Tue Dec 21 12:49:27 2010
@@ -1,4 +1,4 @@
-# printf.m4 serial 40
+# printf.m4 serial 41
 dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -1102,7 +1102,8 @@
                                  gl_cv_func_snprintf_truncation_c99="guessing 
no";;
            openbsd*)             gl_cv_func_snprintf_truncation_c99="guessing 
yes";;
                                  # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5]*)      gl_cv_func_snprintf_truncation_c99="guessing 
no";;
+           solaris2.[0-5] | solaris2.[0-5].*)
+                                 gl_cv_func_snprintf_truncation_c99="guessing 
no";;
            solaris*)             gl_cv_func_snprintf_truncation_c99="guessing 
yes";;
                                  # Guess yes on AIX >= 4.
            aix[1-3]*)            gl_cv_func_snprintf_truncation_c99="guessing 
no";;
@@ -1247,7 +1248,8 @@
            darwin[1-6].*)        gl_cv_func_snprintf_directive_n="guessing 
no";;
            darwin*)              gl_cv_func_snprintf_directive_n="guessing 
yes";;
                                  # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5]*)      gl_cv_func_snprintf_directive_n="guessing 
no";;
+           solaris2.[0-5] | solaris2.[0-5].*)
+                                 gl_cv_func_snprintf_directive_n="guessing 
no";;
            solaris*)             gl_cv_func_snprintf_directive_n="guessing 
yes";;
                                  # Guess yes on AIX >= 4.
            aix[1-3]*)            gl_cv_func_snprintf_directive_n="guessing 
no";;
@@ -1375,7 +1377,8 @@
                                  # Guess yes on Cygwin.
            cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
                                  # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5]*)      gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
+           solaris2.[0-5] | solaris2.[0-5].*)
+                                 gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
            solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
                                  # Guess yes on AIX >= 4.
            aix[1-3]*)            gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;