X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprintf.m4;h=b6f82b5a3c46c4a2f4ca05eaca773c30cb6d120c;hb=dac3bbf96357f7866a1094c228b4e5bea3fcf853;hp=70ac3a38de69d8873a08dc4452d775b2ad0d900f;hpb=c35e40ee80b23eb4c8ae88215297fb00633469c9;p=gnulib.git diff --git a/m4/printf.m4 b/m4/printf.m4 index 70ac3a38d..b6f82b5a3 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 15 -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# printf.m4 serial 22 +dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -95,7 +95,7 @@ AC_DEFUN([gl_PRINTF_LONG_DOUBLE], AC_TRY_RUN([ #include #include -static char buf[100]; +static char buf[10000]; int main () { buf[0] = '\0'; @@ -156,7 +156,7 @@ strisnan (const char *string, size_t start_index, size_t end_index) } return 0; } -static char buf[100]; +static char buf[10000]; static double zero = 0.0; int main () { @@ -240,6 +240,7 @@ AC_DEFUN([gl_PRINTF_INFINITE_LONG_DOUBLE], [gl_cv_func_printf_infinite_long_double], [ AC_TRY_RUN([ +]GL_NOCRASH[ #include #include #include @@ -261,10 +262,11 @@ strisnan (const char *string, size_t start_index, size_t end_index) } return 0; } -static char buf[100]; +static char buf[10000]; static long double zeroL = 0.0L; int main () { + nocrash_init(); if (sprintf (buf, "%Lf", 1.0L / 0.0L) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) return 1; @@ -585,11 +587,16 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_N], AC_TRY_RUN([ #include #include +static char fmtstring[10]; static char buf[100]; int main () { int count = -1; - if (sprintf (buf, "%d %n", 123, &count, 33, 44, 55) < 0 + /* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) + support %n in format strings in read-only memory but not in writable + memory. */ + strcpy (fmtstring, "%d %n"); + if (sprintf (buf, fmtstring, 123, &count, 33, 44, 55) < 0 || strcmp (buf, "123 ") != 0 || count != 4) return 1; @@ -677,6 +684,47 @@ changequote([,])dnl ]) ]) +dnl Test whether the *printf family of functions supports the - flag correctly. +dnl (ISO C99.) See +dnl +dnl Result is gl_cv_func_printf_flag_leftadjust. + +AC_DEFUN([gl_PRINTF_FLAG_LEFTADJUST], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the left-adjust flag correctly], + [gl_cv_func_printf_flag_leftadjust], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + /* Check that a '-' flag is not annihilated by a negative width. */ + if (sprintf (buf, "a%-*sc", -3, "b") < 0 + || strcmp (buf, "ab c") != 0) + return 1; + return 0; +}], + [gl_cv_func_printf_flag_leftadjust=yes], + [gl_cv_func_printf_flag_leftadjust=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on HP-UX 11. + hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";; + # Guess no on HP-UX 10 and older. + hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";; + # Guess yes otherwise. + *) gl_cv_func_printf_flag_leftadjust="guessing yes";; + esac +changequote([,])dnl + ]) + ]) +]) + dnl Test whether the *printf family of functions supports padding of non-finite dnl values with the 0 flag correctly. (ISO C99 + TC1 + TC2.) See dnl @@ -716,6 +764,151 @@ changequote([,])dnl ]) ]) +dnl Test whether the *printf family of functions supports large precisions. +dnl On mingw, precisions larger than 512 are treated like 512, in integer, +dnl floating-point or pointer output. On BeOS, precisions larger than 1044 +dnl crash the program. +dnl Result is gl_cv_func_printf_precision. + +AC_DEFUN([gl_PRINTF_PRECISION], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports large precisions], + [gl_cv_func_printf_precision], + [ + AC_TRY_RUN([ +#include +#include +static char buf[5000]; +int main () +{ +#ifdef __BEOS__ + /* On BeOS, this would crash and show a dialog box. Avoid the crash. */ + return 1; +#endif + if (sprintf (buf, "%.4000d %d", 1, 33, 44) < 4000 + 3) + return 1; + return 0; +}], [gl_cv_func_printf_precision=yes], [gl_cv_func_printf_precision=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess no only on native Win32 and BeOS systems. + mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;; + beos*) gl_cv_func_printf_precision="guessing no" ;; + *) gl_cv_func_printf_precision="guessing yes" ;; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions recovers gracefully in case +dnl of an out-of-memory condition, or whether it crashes the entire program. +dnl Result is gl_cv_func_printf_enomem. + +AC_DEFUN([gl_PRINTF_ENOMEM], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf survives out-of-memory conditions], + [gl_cv_func_printf_enomem], + [ + if test "$cross_compiling" = no; then + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +]GL_NOCRASH[ +changequote(,)dnl +#include +#include +#include +#include +#include +int main() +{ + struct rlimit limit; + int ret; + nocrash_init (); + /* Some printf implementations allocate temporary space with malloc. */ + /* On BSD systems, malloc() is limited by RLIMIT_DATA. */ +#ifdef RLIMIT_DATA + if (getrlimit (RLIMIT_DATA, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > 5000000) + limit.rlim_max = 5000000; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_DATA, &limit) < 0) + return 77; +#endif + /* On Linux systems, malloc() is limited by RLIMIT_AS. */ +#ifdef RLIMIT_AS + if (getrlimit (RLIMIT_AS, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > 5000000) + limit.rlim_max = 5000000; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_AS, &limit) < 0) + return 77; +#endif + /* Some printf implementations allocate temporary space on the stack. */ +#ifdef RLIMIT_STACK + if (getrlimit (RLIMIT_STACK, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > 5000000) + limit.rlim_max = 5000000; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_STACK, &limit) < 0) + return 77; +#endif + ret = printf ("%.5000000f", 1.0); + return !(ret == 5000002 || (ret < 0 && errno == ENOMEM)); +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + (./conftest + result=$? + if test $result != 0 && test $result != 77; then result=1; fi + exit $result + ) >/dev/null 2>/dev/null + case $? in + 0) gl_cv_func_printf_enomem="yes" ;; + 77) gl_cv_func_printf_enomem="guessing no" ;; + *) gl_cv_func_printf_enomem="no" ;; + esac + else + gl_cv_func_printf_enomem="guessing no" + fi + rm -fr conftest* + else +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on Solaris. + solaris*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on AIX. + aix*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on HP-UX/hppa. + hpux*) case "$host_cpu" in + hppa*) gl_cv_func_printf_enomem="guessing yes";; + *) gl_cv_func_printf_enomem="guessing no";; + esac + ;; + # Guess yes on IRIX. + irix*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on OSF/1. + osf*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_enomem="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_enomem="guessing no";; + esac +changequote([,])dnl + fi + ]) +]) + dnl Test whether the snprintf function exists. (ISO C99, POSIX:2001) dnl Result is ac_cv_func_snprintf. @@ -872,11 +1065,16 @@ AC_DEFUN([gl_SNPRINTF_DIRECTIVE_N], AC_TRY_RUN([ #include #include +static char fmtstring[10]; static char buf[100]; int main () { int count = -1; - snprintf (buf, 4, "%d %n", 12345, &count, 33, 44, 55); + /* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) + support %n in format strings in read-only memory but not in writable + memory. */ + strcpy (fmtstring, "%d %n"); + snprintf (buf, 4, fmtstring, 12345, &count, 33, 44, 55); if (count != 6) return 1; return 0; @@ -1028,12 +1226,15 @@ dnl 6 = gl_PRINTF_DIRECTIVE_F dnl 7 = gl_PRINTF_DIRECTIVE_N dnl 8 = gl_PRINTF_POSITIONS dnl 9 = gl_PRINTF_FLAG_GROUPING -dnl 10 = gl_PRINTF_FLAG_ZERO -dnl 11 = gl_SNPRINTF_PRESENCE -dnl 12 = gl_SNPRINTF_TRUNCATION_C99 -dnl 13 = gl_SNPRINTF_RETVAL_C99 -dnl 14 = gl_SNPRINTF_DIRECTIVE_N -dnl 15 = gl_VSNPRINTF_ZEROSIZE_C99 +dnl 10 = gl_PRINTF_FLAG_LEFTADJUST +dnl 11 = gl_PRINTF_FLAG_ZERO +dnl 12 = gl_PRINTF_PRECISION +dnl 13 = gl_PRINTF_ENOMEM +dnl 14 = gl_SNPRINTF_PRESENCE +dnl 15 = gl_SNPRINTF_TRUNCATION_C99 +dnl 16 = gl_SNPRINTF_RETVAL_C99 +dnl 17 = gl_SNPRINTF_DIRECTIVE_N +dnl 18 = gl_VSNPRINTF_ZEROSIZE_C99 dnl dnl 1 = checking whether printf supports size specifiers as in C99... dnl 2 = checking whether printf supports 'long double' arguments... @@ -1044,34 +1245,38 @@ dnl 6 = checking whether printf supports the 'F' directive... dnl 7 = checking whether printf supports the 'n' directive... dnl 8 = checking whether printf supports POSIX/XSI format strings with positions... dnl 9 = checking whether printf supports the grouping flag... -dnl 10 = checking whether printf supports the zero flag correctly... -dnl 11 = checking for snprintf... -dnl 12 = checking whether snprintf truncates the result as in C99... -dnl 13 = checking whether snprintf returns a byte count as in C99... -dnl 14 = checking whether snprintf fully supports the 'n' directive... -dnl 15 = checking whether vsnprintf respects a zero size as in C99... +dnl 10 = checking whether printf supports the left-adjust flag correctly... +dnl 11 = checking whether printf supports the zero flag correctly... +dnl 12 = checking whether printf supports large precisions... +dnl 13 = checking whether printf survives out-of-memory conditions... +dnl 14 = checking for snprintf... +dnl 15 = checking whether snprintf truncates the result as in C99... +dnl 16 = checking whether snprintf returns a byte count as in C99... +dnl 17 = checking whether snprintf fully supports the 'n' directive... +dnl 18 = checking whether vsnprintf respects a zero size as in C99... dnl dnl . = yes, # = no. dnl -dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -dnl glibc 2.5 . . . . . . . . . . . . . . . -dnl glibc 2.3.6 . . . . # . . . . . . . . . . -dnl FreeBSD 5.4, 6.1 . . . . # . . . . # . . . . . -dnl MacOS X 10.3.9 . . . . # . . . . # . . . . . -dnl OpenBSD 3.9, 4.0 . ? ? ? # ? . . ? ? . . . ? ? -dnl Cygwin 2007 (= Cygwin 1.5.24) . . . . # # . . . # . . . . . -dnl Cygwin 2006 (= Cygwin 1.5.19) # . . . # # . . # # . . . . . -dnl Solaris 10 . . # # # . . . . # . . . . . -dnl Solaris 2.6 ... 9 # . # # # # . . . # . . . . . -dnl Solaris 2.5.1 # . # # # # . . . # # # # # # -dnl AIX 5.2 . . # # # . . . . # . . . . . -dnl AIX 4.3.2, 5.1 # . # # # # . . . # . . . . . -dnl HP-UX 11.31 . . . . # . . . . # . . # # . -dnl HP-UX 10.20, 11.{00,11,23} # . . . # # . . . # . . # # # -dnl IRIX 6.5 # . # # # # . . . # . . # . . -dnl OSF/1 5.1 # . # # # # . . . # . . # . # -dnl OSF/1 4.0d # . # # # # . . . # # # # # # -dnl NetBSD 4.0 . ? ? ? ? ? . . ? ? . . . ? ? -dnl NetBSD 3.0 . . . . # # . # # # . . . . . -dnl BeOS # # . # # # . # . . . . . . . -dnl mingw # # # # # # . # # # . # # # . +dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 +dnl glibc 2.5 . . . . . . . . . . . . . . . . . . +dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . +dnl FreeBSD 5.4, 6.1 . . . . # . . . . . # . # . . . . . +dnl MacOS X 10.3.9 . . . . # . . . . . # . # . . . . . +dnl OpenBSD 3.9, 4.0 . . # # # # . . # . # . # . . . . . +dnl Cygwin 2007 (= Cygwin 1.5.24) . . . . # # . . . ? # ? ? . . . . . +dnl Cygwin 2006 (= Cygwin 1.5.19) # . . . # # . . # ? # ? ? . . . . . +dnl Solaris 10 . . # # # . . . . . # . . . . . . . +dnl Solaris 2.6 ... 9 # . # # # # . . . . # . . . . . . . +dnl Solaris 2.5.1 # . # # # # . . . . # . . # # # # # +dnl AIX 5.2 . . # # # . . . . . # . . . . . . . +dnl AIX 4.3.2, 5.1 # . # # # # . . . . # . . . . . . . +dnl HP-UX 11.31 . . . . # . . . . . # . . . . # # . +dnl HP-UX 11.{00,11,23} # . . . # # . . . . # . . . . # # # +dnl HP-UX 10.20 # . . . # # . . . # # . . . . # # # +dnl IRIX 6.5 # . # # # # . . . . # . . . . # . . +dnl OSF/1 5.1 # . # # # # . . . . # . . . . # . # +dnl OSF/1 4.0d # . # # # # . . . . # . . # # # # # +dnl NetBSD 4.0 . ? ? ? ? ? . . ? ? ? ? ? . . . ? ? +dnl NetBSD 3.0 . . . . # # . # # ? # . # . . . . . +dnl BeOS # # . # # # . # . ? . # ? . . . . . +dnl mingw # # # # # # . # # . # # ? . # # # .