X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vasprintf-posix.c;h=6a28cffbfa9dc6e0f2e9ec40ac56e109e82ebe13;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=3d7aa43956130cfb631bc304b67541bb9f71ea66;hpb=ee6d9baacd6be1baf7c81422f2f716e3fe280c05;p=gnulib.git diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c index 3d7aa4395..6a28cffbf 100644 --- a/tests/test-vasprintf-posix.c +++ b/tests/test-vasprintf-posix.c @@ -1,10 +1,10 @@ /* Test of POSIX compatible vasprintf() and asprintf() functions. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ @@ -24,41 +23,21 @@ #include #include #include -#include #include #include #include -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - abort (); \ - } \ - } \ - while (0) - -/* The Compaq (ex-DEC) C 6.4 compiler chokes on the expression 0.0 / 0.0. */ -#ifdef __DECC -static double -NaN () -{ - static double zero = 0.0; - return zero / zero; -} -#else -# define NaN() (0.0 / 0.0) -#endif +#include "macros.h" +#include "minus-zero.h" +#include "infinity.h" +#include "nan.h" /* The SGI MIPS floating-point format does not distinguish 0.0 and -0.0. */ static int have_minus_zero () { static double plus_zero = 0.0; - static double minus_zero = -0.0; + double minus_zero = minus_zerod; return memcmp (&plus_zero, &minus_zero, sizeof (double)) != 0; } @@ -94,19 +73,19 @@ strisnan (const char *string, size_t start_index, size_t end_index, int uppercas if (start_index < end_index) { if (string[start_index] == '-') - start_index++; + start_index++; if (start_index + 3 <= end_index - && memcmp (string + start_index, uppercase ? "NAN" : "nan", 3) == 0) - { - start_index += 3; - if (start_index == end_index - || (string[start_index] == '(' && string[end_index - 1] == ')')) - return 1; - } + && memcmp (string + start_index, uppercase ? "NAN" : "nan", 3) == 0) + { + start_index += 3; + if (start_index == end_index + || (string[start_index] == '(' && string[end_index - 1] == ')')) + return 1; + } } return 0; } - + static void test_function (int (*my_asprintf) (char **, const char *, ...)) { @@ -175,9 +154,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%a %d", 3.1416015625, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.922p+1 33") == 0 - || strcmp (result, "0x3.244p+0 33") == 0 - || strcmp (result, "0x6.488p-1 33") == 0 - || strcmp (result, "0xc.91p-2 33") == 0); + || strcmp (result, "0x3.244p+0 33") == 0 + || strcmp (result, "0x6.488p-1 33") == 0 + || strcmp (result, "0xc.91p-2 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -188,9 +167,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%A %d", -3.1416015625, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-0X1.922P+1 33") == 0 - || strcmp (result, "-0X3.244P+0 33") == 0 - || strcmp (result, "-0X6.488P-1 33") == 0 - || strcmp (result, "-0XC.91P-2 33") == 0); + || strcmp (result, "-0X3.244P+0 33") == 0 + || strcmp (result, "-0X6.488P-1 33") == 0 + || strcmp (result, "-0XC.91P-2 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -208,7 +187,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%a %d", -0.0, 33, 44, 55); + my_asprintf (&result, "%a %d", minus_zerod, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0x0p+0 33") == 0); @@ -219,7 +198,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%a %d", 1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%a %d", Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0); ASSERT (retval == strlen (result)); @@ -229,7 +208,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%a %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%a %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0); ASSERT (retval == strlen (result)); @@ -239,11 +218,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* NaN. */ char *result; int retval = - my_asprintf (&result, "%a %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%a %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -253,10 +232,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%.0a %d", 1.5, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "0x2p+0 33") == 0 - || strcmp (result, "0x3p-1 33") == 0 - || strcmp (result, "0x6p-2 33") == 0 - || strcmp (result, "0xcp-3 33") == 0); + ASSERT (strcmp (result, "0x1p+0 33") == 0 + || strcmp (result, "0x2p+0 33") == 0 + || strcmp (result, "0x3p-1 33") == 0 + || strcmp (result, "0x6p-2 33") == 0 + || strcmp (result, "0xcp-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -266,10 +246,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%.0a %d", 1.51, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "0x2p+0 33") == 0 - || strcmp (result, "0x3p-1 33") == 0 - || strcmp (result, "0x6p-2 33") == 0 - || strcmp (result, "0xcp-3 33") == 0); + ASSERT (strcmp (result, "0x1p+0 33") == 0 + || strcmp (result, "0x2p+0 33") == 0 + || strcmp (result, "0x3p-1 33") == 0 + || strcmp (result, "0x6p-2 33") == 0 + || strcmp (result, "0xcp-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -280,9 +261,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.1a %d", 1.51, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.8p+0 33") == 0 - || strcmp (result, "0x3.0p-1 33") == 0 - || strcmp (result, "0x6.1p-2 33") == 0 - || strcmp (result, "0xc.1p-3 33") == 0); + || strcmp (result, "0x3.0p-1 33") == 0 + || strcmp (result, "0x6.1p-2 33") == 0 + || strcmp (result, "0xc.1p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -293,9 +274,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.2a %d", 1.51, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.83p+0 33") == 0 - || strcmp (result, "0x3.05p-1 33") == 0 - || strcmp (result, "0x6.0ap-2 33") == 0 - || strcmp (result, "0xc.14p-3 33") == 0); + || strcmp (result, "0x3.05p-1 33") == 0 + || strcmp (result, "0x6.0ap-2 33") == 0 + || strcmp (result, "0xc.14p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -306,9 +287,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.3a %d", 1.51, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.829p+0 33") == 0 - || strcmp (result, "0x3.052p-1 33") == 0 - || strcmp (result, "0x6.0a4p-2 33") == 0 - || strcmp (result, "0xc.148p-3 33") == 0); + || strcmp (result, "0x3.052p-1 33") == 0 + || strcmp (result, "0x6.0a4p-2 33") == 0 + || strcmp (result, "0xc.148p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -319,23 +300,23 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.3a %d", 1.49999, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.800p+0 33") == 0 - || strcmp (result, "0x3.000p-1 33") == 0 - || strcmp (result, "0x6.000p-2 33") == 0 - || strcmp (result, "0xc.000p-3 33") == 0); + || strcmp (result, "0x3.000p-1 33") == 0 + || strcmp (result, "0x6.000p-2 33") == 0 + || strcmp (result, "0xc.000p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* Rounding can turn a ...FFF into a ...000. - This shows a MacOS X 10.3.9 (Darwin 7.9) bug. */ + This shows a Mac OS X 10.3.9 (Darwin 7.9) bug. */ char *result; int retval = my_asprintf (&result, "%.1a %d", 1.999, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.0p+1 33") == 0 - || strcmp (result, "0x2.0p+0 33") == 0 - || strcmp (result, "0x4.0p-1 33") == 0 - || strcmp (result, "0x8.0p-2 33") == 0); + || strcmp (result, "0x2.0p+0 33") == 0 + || strcmp (result, "0x4.0p-1 33") == 0 + || strcmp (result, "0x8.0p-2 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -346,9 +327,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%10a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " 0x1.cp+0 33") == 0 - || strcmp (result, " 0x3.8p-1 33") == 0 - || strcmp (result, " 0x7p-2 33") == 0 - || strcmp (result, " 0xep-3 33") == 0); + || strcmp (result, " 0x3.8p-1 33") == 0 + || strcmp (result, " 0x7p-2 33") == 0 + || strcmp (result, " 0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -359,9 +340,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.10a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.c000000000p+0 33") == 0 - || strcmp (result, "0x3.8000000000p-1 33") == 0 - || strcmp (result, "0x7.0000000000p-2 33") == 0 - || strcmp (result, "0xe.0000000000p-3 33") == 0); + || strcmp (result, "0x3.8000000000p-1 33") == 0 + || strcmp (result, "0x7.0000000000p-2 33") == 0 + || strcmp (result, "0xe.0000000000p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -372,9 +353,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.50a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.c0000000000000000000000000000000000000000000000000p+0 33") == 0 - || strcmp (result, "0x3.80000000000000000000000000000000000000000000000000p-1 33") == 0 - || strcmp (result, "0x7.00000000000000000000000000000000000000000000000000p-2 33") == 0 - || strcmp (result, "0xe.00000000000000000000000000000000000000000000000000p-3 33") == 0); + || strcmp (result, "0x3.80000000000000000000000000000000000000000000000000p-1 33") == 0 + || strcmp (result, "0x7.00000000000000000000000000000000000000000000000000p-2 33") == 0 + || strcmp (result, "0xe.00000000000000000000000000000000000000000000000000p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -385,9 +366,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%-10a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.cp+0 33") == 0 - || strcmp (result, "0x3.8p-1 33") == 0 - || strcmp (result, "0x7p-2 33") == 0 - || strcmp (result, "0xep-3 33") == 0); + || strcmp (result, "0x3.8p-1 33") == 0 + || strcmp (result, "0x7p-2 33") == 0 + || strcmp (result, "0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -398,9 +379,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%+a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "+0x1.cp+0 33") == 0 - || strcmp (result, "+0x3.8p-1 33") == 0 - || strcmp (result, "+0x7p-2 33") == 0 - || strcmp (result, "+0xep-3 33") == 0); + || strcmp (result, "+0x3.8p-1 33") == 0 + || strcmp (result, "+0x7p-2 33") == 0 + || strcmp (result, "+0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -411,9 +392,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "% a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " 0x1.cp+0 33") == 0 - || strcmp (result, " 0x3.8p-1 33") == 0 - || strcmp (result, " 0x7p-2 33") == 0 - || strcmp (result, " 0xep-3 33") == 0); + || strcmp (result, " 0x3.8p-1 33") == 0 + || strcmp (result, " 0x7p-2 33") == 0 + || strcmp (result, " 0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -424,9 +405,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.cp+0 33") == 0 - || strcmp (result, "0x3.8p-1 33") == 0 - || strcmp (result, "0x7.p-2 33") == 0 - || strcmp (result, "0xe.p-3 33") == 0); + || strcmp (result, "0x3.8p-1 33") == 0 + || strcmp (result, "0x7.p-2 33") == 0 + || strcmp (result, "0xe.p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -437,9 +418,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#a %d", 1.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.p+0 33") == 0 - || strcmp (result, "0x2.p-1 33") == 0 - || strcmp (result, "0x4.p-2 33") == 0 - || strcmp (result, "0x8.p-3 33") == 0); + || strcmp (result, "0x2.p-1 33") == 0 + || strcmp (result, "0x4.p-2 33") == 0 + || strcmp (result, "0x8.p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -450,9 +431,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%010a %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x001.cp+0 33") == 0 - || strcmp (result, "0x003.8p-1 33") == 0 - || strcmp (result, "0x00007p-2 33") == 0 - || strcmp (result, "0x0000ep-3 33") == 0); + || strcmp (result, "0x003.8p-1 33") == 0 + || strcmp (result, "0x00007p-2 33") == 0 + || strcmp (result, "0x0000ep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -460,7 +441,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%010a %d", 1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%010a %d", Infinityd (), 33, 44, 55); ASSERT (result != NULL); /* "0000000inf 33" is not a valid result; see */ @@ -472,13 +453,13 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with NaN. */ char *result; int retval = - my_asprintf (&result, "%050a %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%050a %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); /* "0000000nan 33" is not a valid result; see */ ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -489,9 +470,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", 3.1416015625L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.922p+1 33") == 0 - || strcmp (result, "0x3.244p+0 33") == 0 - || strcmp (result, "0x6.488p-1 33") == 0 - || strcmp (result, "0xc.91p-2 33") == 0); + || strcmp (result, "0x3.244p+0 33") == 0 + || strcmp (result, "0x6.488p-1 33") == 0 + || strcmp (result, "0xc.91p-2 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -502,9 +483,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%LA %d", -3.1416015625L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-0X1.922P+1 33") == 0 - || strcmp (result, "-0X3.244P+0 33") == 0 - || strcmp (result, "-0X6.488P-1 33") == 0 - || strcmp (result, "-0XC.91P-2 33") == 0); + || strcmp (result, "-0X3.244P+0 33") == 0 + || strcmp (result, "-0X6.488P-1 33") == 0 + || strcmp (result, "-0XC.91P-2 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -522,7 +503,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%La %d", -0.0L, 33, 44, 55); + my_asprintf (&result, "%La %d", minus_zerol, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0x0p+0 33") == 0); @@ -533,7 +514,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%La %d", 1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%La %d", Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0); ASSERT (retval == strlen (result)); @@ -543,7 +524,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%La %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%La %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0); ASSERT (retval == strlen (result)); @@ -553,15 +534,15 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* NaN. */ char *result; int retval = - my_asprintf (&result, "%La %d", 0.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%La %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } -#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) +#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE { /* Quiet NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) }; @@ -570,8 +551,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -584,8 +565,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -604,8 +585,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -617,8 +598,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -630,8 +611,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -643,8 +624,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -656,8 +637,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -669,9 +650,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.0La %d", 1.5L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x2p+0 33") == 0 - || strcmp (result, "0x3p-1 33") == 0 - || strcmp (result, "0x6p-2 33") == 0 - || strcmp (result, "0xcp-3 33") == 0); + || strcmp (result, "0x3p-1 33") == 0 + || strcmp (result, "0x6p-2 33") == 0 + || strcmp (result, "0xcp-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -682,9 +663,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.0La %d", 1.51L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x2p+0 33") == 0 - || strcmp (result, "0x3p-1 33") == 0 - || strcmp (result, "0x6p-2 33") == 0 - || strcmp (result, "0xcp-3 33") == 0); + || strcmp (result, "0x3p-1 33") == 0 + || strcmp (result, "0x6p-2 33") == 0 + || strcmp (result, "0xcp-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -695,9 +676,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.1La %d", 1.51L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.8p+0 33") == 0 - || strcmp (result, "0x3.0p-1 33") == 0 - || strcmp (result, "0x6.1p-2 33") == 0 - || strcmp (result, "0xc.1p-3 33") == 0); + || strcmp (result, "0x3.0p-1 33") == 0 + || strcmp (result, "0x6.1p-2 33") == 0 + || strcmp (result, "0xc.1p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -708,9 +689,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.2La %d", 1.51L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.83p+0 33") == 0 - || strcmp (result, "0x3.05p-1 33") == 0 - || strcmp (result, "0x6.0ap-2 33") == 0 - || strcmp (result, "0xc.14p-3 33") == 0); + || strcmp (result, "0x3.05p-1 33") == 0 + || strcmp (result, "0x6.0ap-2 33") == 0 + || strcmp (result, "0xc.14p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -721,9 +702,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.3La %d", 1.51L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.829p+0 33") == 0 - || strcmp (result, "0x3.052p-1 33") == 0 - || strcmp (result, "0x6.0a4p-2 33") == 0 - || strcmp (result, "0xc.148p-3 33") == 0); + || strcmp (result, "0x3.052p-1 33") == 0 + || strcmp (result, "0x6.0a4p-2 33") == 0 + || strcmp (result, "0xc.148p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -734,24 +715,24 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.3La %d", 1.49999L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.800p+0 33") == 0 - || strcmp (result, "0x3.000p-1 33") == 0 - || strcmp (result, "0x6.000p-2 33") == 0 - || strcmp (result, "0xc.000p-3 33") == 0); + || strcmp (result, "0x3.000p-1 33") == 0 + || strcmp (result, "0x6.000p-2 33") == 0 + || strcmp (result, "0xc.000p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* Rounding can turn a ...FFF into a ...000. - This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a + This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a glibc 2.4 bug . */ char *result; int retval = my_asprintf (&result, "%.1La %d", 1.999L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.0p+1 33") == 0 - || strcmp (result, "0x2.0p+0 33") == 0 - || strcmp (result, "0x4.0p-1 33") == 0 - || strcmp (result, "0x8.0p-2 33") == 0); + || strcmp (result, "0x2.0p+0 33") == 0 + || strcmp (result, "0x4.0p-1 33") == 0 + || strcmp (result, "0x8.0p-2 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -762,9 +743,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%10La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " 0x1.cp+0 33") == 0 - || strcmp (result, " 0x3.8p-1 33") == 0 - || strcmp (result, " 0x7p-2 33") == 0 - || strcmp (result, " 0xep-3 33") == 0); + || strcmp (result, " 0x3.8p-1 33") == 0 + || strcmp (result, " 0x7p-2 33") == 0 + || strcmp (result, " 0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -775,9 +756,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.10La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.c000000000p+0 33") == 0 - || strcmp (result, "0x3.8000000000p-1 33") == 0 - || strcmp (result, "0x7.0000000000p-2 33") == 0 - || strcmp (result, "0xe.0000000000p-3 33") == 0); + || strcmp (result, "0x3.8000000000p-1 33") == 0 + || strcmp (result, "0x7.0000000000p-2 33") == 0 + || strcmp (result, "0xe.0000000000p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -788,9 +769,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.50La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.c0000000000000000000000000000000000000000000000000p+0 33") == 0 - || strcmp (result, "0x3.80000000000000000000000000000000000000000000000000p-1 33") == 0 - || strcmp (result, "0x7.00000000000000000000000000000000000000000000000000p-2 33") == 0 - || strcmp (result, "0xe.00000000000000000000000000000000000000000000000000p-3 33") == 0); + || strcmp (result, "0x3.80000000000000000000000000000000000000000000000000p-1 33") == 0 + || strcmp (result, "0x7.00000000000000000000000000000000000000000000000000p-2 33") == 0 + || strcmp (result, "0xe.00000000000000000000000000000000000000000000000000p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -801,9 +782,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%-10La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.cp+0 33") == 0 - || strcmp (result, "0x3.8p-1 33") == 0 - || strcmp (result, "0x7p-2 33") == 0 - || strcmp (result, "0xep-3 33") == 0); + || strcmp (result, "0x3.8p-1 33") == 0 + || strcmp (result, "0x7p-2 33") == 0 + || strcmp (result, "0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -814,9 +795,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%+La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "+0x1.cp+0 33") == 0 - || strcmp (result, "+0x3.8p-1 33") == 0 - || strcmp (result, "+0x7p-2 33") == 0 - || strcmp (result, "+0xep-3 33") == 0); + || strcmp (result, "+0x3.8p-1 33") == 0 + || strcmp (result, "+0x7p-2 33") == 0 + || strcmp (result, "+0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -827,9 +808,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "% La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " 0x1.cp+0 33") == 0 - || strcmp (result, " 0x3.8p-1 33") == 0 - || strcmp (result, " 0x7p-2 33") == 0 - || strcmp (result, " 0xep-3 33") == 0); + || strcmp (result, " 0x3.8p-1 33") == 0 + || strcmp (result, " 0x7p-2 33") == 0 + || strcmp (result, " 0xep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -840,9 +821,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.cp+0 33") == 0 - || strcmp (result, "0x3.8p-1 33") == 0 - || strcmp (result, "0x7.p-2 33") == 0 - || strcmp (result, "0xe.p-3 33") == 0); + || strcmp (result, "0x3.8p-1 33") == 0 + || strcmp (result, "0x7.p-2 33") == 0 + || strcmp (result, "0xe.p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -853,9 +834,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#La %d", 1.0L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x1.p+0 33") == 0 - || strcmp (result, "0x2.p-1 33") == 0 - || strcmp (result, "0x4.p-2 33") == 0 - || strcmp (result, "0x8.p-3 33") == 0); + || strcmp (result, "0x2.p-1 33") == 0 + || strcmp (result, "0x4.p-2 33") == 0 + || strcmp (result, "0x8.p-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -866,9 +847,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%010La %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0x001.cp+0 33") == 0 - || strcmp (result, "0x003.8p-1 33") == 0 - || strcmp (result, "0x00007p-2 33") == 0 - || strcmp (result, "0x0000ep-3 33") == 0); + || strcmp (result, "0x003.8p-1 33") == 0 + || strcmp (result, "0x00007p-2 33") == 0 + || strcmp (result, "0x0000ep-3 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -876,7 +857,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%010La %d", 1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%010La %d", Infinityl (), 33, 44, 55); ASSERT (result != NULL); /* "0000000inf 33" is not a valid result; see */ @@ -888,13 +869,13 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with NaN. */ char *result; int retval = - my_asprintf (&result, "%050La %d", 0.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%050La %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); /* "0000000nan 33" is not a valid result; see */ ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -924,91 +905,91 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Small and large positive numbers. */ static struct { double value; const char *string; } data[] = { - { 1.234321234321234e-37, "0.000000" }, - { 1.234321234321234e-36, "0.000000" }, - { 1.234321234321234e-35, "0.000000" }, - { 1.234321234321234e-34, "0.000000" }, - { 1.234321234321234e-33, "0.000000" }, - { 1.234321234321234e-32, "0.000000" }, - { 1.234321234321234e-31, "0.000000" }, - { 1.234321234321234e-30, "0.000000" }, - { 1.234321234321234e-29, "0.000000" }, - { 1.234321234321234e-28, "0.000000" }, - { 1.234321234321234e-27, "0.000000" }, - { 1.234321234321234e-26, "0.000000" }, - { 1.234321234321234e-25, "0.000000" }, - { 1.234321234321234e-24, "0.000000" }, - { 1.234321234321234e-23, "0.000000" }, - { 1.234321234321234e-22, "0.000000" }, - { 1.234321234321234e-21, "0.000000" }, - { 1.234321234321234e-20, "0.000000" }, - { 1.234321234321234e-19, "0.000000" }, - { 1.234321234321234e-18, "0.000000" }, - { 1.234321234321234e-17, "0.000000" }, - { 1.234321234321234e-16, "0.000000" }, - { 1.234321234321234e-15, "0.000000" }, - { 1.234321234321234e-14, "0.000000" }, - { 1.234321234321234e-13, "0.000000" }, - { 1.234321234321234e-12, "0.000000" }, - { 1.234321234321234e-11, "0.000000" }, - { 1.234321234321234e-10, "0.000000" }, - { 1.234321234321234e-9, "0.000000" }, - { 1.234321234321234e-8, "0.000000" }, - { 1.234321234321234e-7, "0.000000" }, - { 1.234321234321234e-6, "0.000001" }, - { 1.234321234321234e-5, "0.000012" }, - { 1.234321234321234e-4, "0.000123" }, - { 1.234321234321234e-3, "0.001234" }, - { 1.234321234321234e-2, "0.012343" }, - { 1.234321234321234e-1, "0.123432" }, - { 1.234321234321234, "1.234321" }, - { 1.234321234321234e1, "12.343212" }, - { 1.234321234321234e2, "123.432123" }, - { 1.234321234321234e3, "1234.321234" }, - { 1.234321234321234e4, "12343.212343" }, - { 1.234321234321234e5, "123432.123432" }, - { 1.234321234321234e6, "1234321.234321" }, - { 1.234321234321234e7, "12343212.343212" }, - { 1.234321234321234e8, "123432123.432123" }, - { 1.234321234321234e9, "1234321234.321234" }, - { 1.234321234321234e10, "12343212343.2123**" }, - { 1.234321234321234e11, "123432123432.123***" }, - { 1.234321234321234e12, "1234321234321.23****" }, - { 1.234321234321234e13, "12343212343212.3*****" }, - { 1.234321234321234e14, "123432123432123.******" }, - { 1.234321234321234e15, "1234321234321234.000000" }, - { 1.234321234321234e16, "123432123432123**.000000" }, - { 1.234321234321234e17, "123432123432123***.000000" }, - { 1.234321234321234e18, "123432123432123****.000000" }, - { 1.234321234321234e19, "123432123432123*****.000000" }, - { 1.234321234321234e20, "123432123432123******.000000" }, - { 1.234321234321234e21, "123432123432123*******.000000" }, - { 1.234321234321234e22, "123432123432123********.000000" }, - { 1.234321234321234e23, "123432123432123*********.000000" }, - { 1.234321234321234e24, "123432123432123**********.000000" }, - { 1.234321234321234e25, "123432123432123***********.000000" }, - { 1.234321234321234e26, "123432123432123************.000000" }, - { 1.234321234321234e27, "123432123432123*************.000000" }, - { 1.234321234321234e28, "123432123432123**************.000000" }, - { 1.234321234321234e29, "123432123432123***************.000000" }, - { 1.234321234321234e30, "123432123432123****************.000000" }, - { 1.234321234321234e31, "123432123432123*****************.000000" }, - { 1.234321234321234e32, "123432123432123******************.000000" }, - { 1.234321234321234e33, "123432123432123*******************.000000" }, - { 1.234321234321234e34, "123432123432123********************.000000" }, - { 1.234321234321234e35, "123432123432123*********************.000000" }, - { 1.234321234321234e36, "123432123432123**********************.000000" } + { 1.234321234321234e-37, "0.000000" }, + { 1.234321234321234e-36, "0.000000" }, + { 1.234321234321234e-35, "0.000000" }, + { 1.234321234321234e-34, "0.000000" }, + { 1.234321234321234e-33, "0.000000" }, + { 1.234321234321234e-32, "0.000000" }, + { 1.234321234321234e-31, "0.000000" }, + { 1.234321234321234e-30, "0.000000" }, + { 1.234321234321234e-29, "0.000000" }, + { 1.234321234321234e-28, "0.000000" }, + { 1.234321234321234e-27, "0.000000" }, + { 1.234321234321234e-26, "0.000000" }, + { 1.234321234321234e-25, "0.000000" }, + { 1.234321234321234e-24, "0.000000" }, + { 1.234321234321234e-23, "0.000000" }, + { 1.234321234321234e-22, "0.000000" }, + { 1.234321234321234e-21, "0.000000" }, + { 1.234321234321234e-20, "0.000000" }, + { 1.234321234321234e-19, "0.000000" }, + { 1.234321234321234e-18, "0.000000" }, + { 1.234321234321234e-17, "0.000000" }, + { 1.234321234321234e-16, "0.000000" }, + { 1.234321234321234e-15, "0.000000" }, + { 1.234321234321234e-14, "0.000000" }, + { 1.234321234321234e-13, "0.000000" }, + { 1.234321234321234e-12, "0.000000" }, + { 1.234321234321234e-11, "0.000000" }, + { 1.234321234321234e-10, "0.000000" }, + { 1.234321234321234e-9, "0.000000" }, + { 1.234321234321234e-8, "0.000000" }, + { 1.234321234321234e-7, "0.000000" }, + { 1.234321234321234e-6, "0.000001" }, + { 1.234321234321234e-5, "0.000012" }, + { 1.234321234321234e-4, "0.000123" }, + { 1.234321234321234e-3, "0.001234" }, + { 1.234321234321234e-2, "0.012343" }, + { 1.234321234321234e-1, "0.123432" }, + { 1.234321234321234, "1.234321" }, + { 1.234321234321234e1, "12.343212" }, + { 1.234321234321234e2, "123.432123" }, + { 1.234321234321234e3, "1234.321234" }, + { 1.234321234321234e4, "12343.212343" }, + { 1.234321234321234e5, "123432.123432" }, + { 1.234321234321234e6, "1234321.234321" }, + { 1.234321234321234e7, "12343212.343212" }, + { 1.234321234321234e8, "123432123.432123" }, + { 1.234321234321234e9, "1234321234.321234" }, + { 1.234321234321234e10, "12343212343.2123**" }, + { 1.234321234321234e11, "123432123432.123***" }, + { 1.234321234321234e12, "1234321234321.23****" }, + { 1.234321234321234e13, "12343212343212.3*****" }, + { 1.234321234321234e14, "123432123432123.******" }, + { 1.234321234321234e15, "1234321234321234.000000" }, + { 1.234321234321234e16, "123432123432123**.000000" }, + { 1.234321234321234e17, "123432123432123***.000000" }, + { 1.234321234321234e18, "123432123432123****.000000" }, + { 1.234321234321234e19, "123432123432123*****.000000" }, + { 1.234321234321234e20, "123432123432123******.000000" }, + { 1.234321234321234e21, "123432123432123*******.000000" }, + { 1.234321234321234e22, "123432123432123********.000000" }, + { 1.234321234321234e23, "123432123432123*********.000000" }, + { 1.234321234321234e24, "123432123432123**********.000000" }, + { 1.234321234321234e25, "123432123432123***********.000000" }, + { 1.234321234321234e26, "123432123432123************.000000" }, + { 1.234321234321234e27, "123432123432123*************.000000" }, + { 1.234321234321234e28, "123432123432123**************.000000" }, + { 1.234321234321234e29, "123432123432123***************.000000" }, + { 1.234321234321234e30, "123432123432123****************.000000" }, + { 1.234321234321234e31, "123432123432123*****************.000000" }, + { 1.234321234321234e32, "123432123432123******************.000000" }, + { 1.234321234321234e33, "123432123432123*******************.000000" }, + { 1.234321234321234e34, "123432123432123********************.000000" }, + { 1.234321234321234e35, "123432123432123*********************.000000" }, + { 1.234321234321234e36, "123432123432123**********************.000000" } }; size_t k; for (k = 0; k < SIZEOF (data); k++) { - char *result; - int retval = - my_asprintf (&result, "%f", data[k].value); - ASSERT (result != NULL); - ASSERT (strmatch (data[k].string, result)); - ASSERT (retval == strlen (result)); - free (result); + char *result; + int retval = + my_asprintf (&result, "%f", data[k].value); + ASSERT (result != NULL); + ASSERT (strmatch (data[k].string, result)); + ASSERT (retval == strlen (result)); + free (result); } } @@ -1035,7 +1016,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%f %d", -0.0, 33, 44, 55); + my_asprintf (&result, "%f %d", minus_zerod, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); @@ -1046,10 +1027,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%f %d", 1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%f %d", Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0 - || strcmp (result, "infinity 33") == 0); + || strcmp (result, "infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1057,10 +1038,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%f %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%f %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0 - || strcmp (result, "-infinity 33") == 0); + || strcmp (result, "-infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1068,11 +1049,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* NaN. */ char *result; int retval = - my_asprintf (&result, "%f %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%f %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1150,10 +1131,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015f %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%015f %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -inf 33") == 0 - || strcmp (result, " -infinity 33") == 0); + || strcmp (result, " -infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1161,11 +1142,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with NaN. */ char *result; int retval = - my_asprintf (&result, "%050f %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%050f %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1180,6 +1161,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) free (result); } + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2f %d", 999.951, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2f %d", 999.996, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + { /* A positive number. */ char *result; int retval = @@ -1203,91 +1204,91 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Small and large positive numbers. */ static struct { long double value; const char *string; } data[] = { - { 1.234321234321234e-37L, "0.000000" }, - { 1.234321234321234e-36L, "0.000000" }, - { 1.234321234321234e-35L, "0.000000" }, - { 1.234321234321234e-34L, "0.000000" }, - { 1.234321234321234e-33L, "0.000000" }, - { 1.234321234321234e-32L, "0.000000" }, - { 1.234321234321234e-31L, "0.000000" }, - { 1.234321234321234e-30L, "0.000000" }, - { 1.234321234321234e-29L, "0.000000" }, - { 1.234321234321234e-28L, "0.000000" }, - { 1.234321234321234e-27L, "0.000000" }, - { 1.234321234321234e-26L, "0.000000" }, - { 1.234321234321234e-25L, "0.000000" }, - { 1.234321234321234e-24L, "0.000000" }, - { 1.234321234321234e-23L, "0.000000" }, - { 1.234321234321234e-22L, "0.000000" }, - { 1.234321234321234e-21L, "0.000000" }, - { 1.234321234321234e-20L, "0.000000" }, - { 1.234321234321234e-19L, "0.000000" }, - { 1.234321234321234e-18L, "0.000000" }, - { 1.234321234321234e-17L, "0.000000" }, - { 1.234321234321234e-16L, "0.000000" }, - { 1.234321234321234e-15L, "0.000000" }, - { 1.234321234321234e-14L, "0.000000" }, - { 1.234321234321234e-13L, "0.000000" }, - { 1.234321234321234e-12L, "0.000000" }, - { 1.234321234321234e-11L, "0.000000" }, - { 1.234321234321234e-10L, "0.000000" }, - { 1.234321234321234e-9L, "0.000000" }, - { 1.234321234321234e-8L, "0.000000" }, - { 1.234321234321234e-7L, "0.000000" }, - { 1.234321234321234e-6L, "0.000001" }, - { 1.234321234321234e-5L, "0.000012" }, - { 1.234321234321234e-4L, "0.000123" }, - { 1.234321234321234e-3L, "0.001234" }, - { 1.234321234321234e-2L, "0.012343" }, - { 1.234321234321234e-1L, "0.123432" }, - { 1.234321234321234L, "1.234321" }, - { 1.234321234321234e1L, "12.343212" }, - { 1.234321234321234e2L, "123.432123" }, - { 1.234321234321234e3L, "1234.321234" }, - { 1.234321234321234e4L, "12343.212343" }, - { 1.234321234321234e5L, "123432.123432" }, - { 1.234321234321234e6L, "1234321.234321" }, - { 1.234321234321234e7L, "12343212.343212" }, - { 1.234321234321234e8L, "123432123.432123" }, - { 1.234321234321234e9L, "1234321234.321234" }, - { 1.234321234321234e10L, "12343212343.2123**" }, - { 1.234321234321234e11L, "123432123432.123***" }, - { 1.234321234321234e12L, "1234321234321.23****" }, - { 1.234321234321234e13L, "12343212343212.3*****" }, - { 1.234321234321234e14L, "123432123432123.******" }, - { 1.234321234321234e15L, "1234321234321234.000000" }, - { 1.234321234321234e16L, "123432123432123**.000000" }, - { 1.234321234321234e17L, "123432123432123***.000000" }, - { 1.234321234321234e18L, "123432123432123****.000000" }, - { 1.234321234321234e19L, "123432123432123*****.000000" }, - { 1.234321234321234e20L, "123432123432123******.000000" }, - { 1.234321234321234e21L, "123432123432123*******.000000" }, - { 1.234321234321234e22L, "123432123432123********.000000" }, - { 1.234321234321234e23L, "123432123432123*********.000000" }, - { 1.234321234321234e24L, "123432123432123**********.000000" }, - { 1.234321234321234e25L, "123432123432123***********.000000" }, - { 1.234321234321234e26L, "123432123432123************.000000" }, - { 1.234321234321234e27L, "123432123432123*************.000000" }, - { 1.234321234321234e28L, "123432123432123**************.000000" }, - { 1.234321234321234e29L, "123432123432123***************.000000" }, - { 1.234321234321234e30L, "123432123432123****************.000000" }, - { 1.234321234321234e31L, "123432123432123*****************.000000" }, - { 1.234321234321234e32L, "123432123432123******************.000000" }, - { 1.234321234321234e33L, "123432123432123*******************.000000" }, - { 1.234321234321234e34L, "123432123432123********************.000000" }, - { 1.234321234321234e35L, "123432123432123*********************.000000" }, - { 1.234321234321234e36L, "123432123432123**********************.000000" } + { 1.234321234321234e-37L, "0.000000" }, + { 1.234321234321234e-36L, "0.000000" }, + { 1.234321234321234e-35L, "0.000000" }, + { 1.234321234321234e-34L, "0.000000" }, + { 1.234321234321234e-33L, "0.000000" }, + { 1.234321234321234e-32L, "0.000000" }, + { 1.234321234321234e-31L, "0.000000" }, + { 1.234321234321234e-30L, "0.000000" }, + { 1.234321234321234e-29L, "0.000000" }, + { 1.234321234321234e-28L, "0.000000" }, + { 1.234321234321234e-27L, "0.000000" }, + { 1.234321234321234e-26L, "0.000000" }, + { 1.234321234321234e-25L, "0.000000" }, + { 1.234321234321234e-24L, "0.000000" }, + { 1.234321234321234e-23L, "0.000000" }, + { 1.234321234321234e-22L, "0.000000" }, + { 1.234321234321234e-21L, "0.000000" }, + { 1.234321234321234e-20L, "0.000000" }, + { 1.234321234321234e-19L, "0.000000" }, + { 1.234321234321234e-18L, "0.000000" }, + { 1.234321234321234e-17L, "0.000000" }, + { 1.234321234321234e-16L, "0.000000" }, + { 1.234321234321234e-15L, "0.000000" }, + { 1.234321234321234e-14L, "0.000000" }, + { 1.234321234321234e-13L, "0.000000" }, + { 1.234321234321234e-12L, "0.000000" }, + { 1.234321234321234e-11L, "0.000000" }, + { 1.234321234321234e-10L, "0.000000" }, + { 1.234321234321234e-9L, "0.000000" }, + { 1.234321234321234e-8L, "0.000000" }, + { 1.234321234321234e-7L, "0.000000" }, + { 1.234321234321234e-6L, "0.000001" }, + { 1.234321234321234e-5L, "0.000012" }, + { 1.234321234321234e-4L, "0.000123" }, + { 1.234321234321234e-3L, "0.001234" }, + { 1.234321234321234e-2L, "0.012343" }, + { 1.234321234321234e-1L, "0.123432" }, + { 1.234321234321234L, "1.234321" }, + { 1.234321234321234e1L, "12.343212" }, + { 1.234321234321234e2L, "123.432123" }, + { 1.234321234321234e3L, "1234.321234" }, + { 1.234321234321234e4L, "12343.212343" }, + { 1.234321234321234e5L, "123432.123432" }, + { 1.234321234321234e6L, "1234321.234321" }, + { 1.234321234321234e7L, "12343212.343212" }, + { 1.234321234321234e8L, "123432123.432123" }, + { 1.234321234321234e9L, "1234321234.321234" }, + { 1.234321234321234e10L, "12343212343.2123**" }, + { 1.234321234321234e11L, "123432123432.123***" }, + { 1.234321234321234e12L, "1234321234321.23****" }, + { 1.234321234321234e13L, "12343212343212.3*****" }, + { 1.234321234321234e14L, "123432123432123.******" }, + { 1.234321234321234e15L, "1234321234321234.000000" }, + { 1.234321234321234e16L, "123432123432123**.000000" }, + { 1.234321234321234e17L, "123432123432123***.000000" }, + { 1.234321234321234e18L, "123432123432123****.000000" }, + { 1.234321234321234e19L, "123432123432123*****.000000" }, + { 1.234321234321234e20L, "123432123432123******.000000" }, + { 1.234321234321234e21L, "123432123432123*******.000000" }, + { 1.234321234321234e22L, "123432123432123********.000000" }, + { 1.234321234321234e23L, "123432123432123*********.000000" }, + { 1.234321234321234e24L, "123432123432123**********.000000" }, + { 1.234321234321234e25L, "123432123432123***********.000000" }, + { 1.234321234321234e26L, "123432123432123************.000000" }, + { 1.234321234321234e27L, "123432123432123*************.000000" }, + { 1.234321234321234e28L, "123432123432123**************.000000" }, + { 1.234321234321234e29L, "123432123432123***************.000000" }, + { 1.234321234321234e30L, "123432123432123****************.000000" }, + { 1.234321234321234e31L, "123432123432123*****************.000000" }, + { 1.234321234321234e32L, "123432123432123******************.000000" }, + { 1.234321234321234e33L, "123432123432123*******************.000000" }, + { 1.234321234321234e34L, "123432123432123********************.000000" }, + { 1.234321234321234e35L, "123432123432123*********************.000000" }, + { 1.234321234321234e36L, "123432123432123**********************.000000" } }; size_t k; for (k = 0; k < SIZEOF (data); k++) { - char *result; - int retval = - my_asprintf (&result, "%Lf", data[k].value); - ASSERT (result != NULL); - ASSERT (strmatch (data[k].string, result)); - ASSERT (retval == strlen (result)); - free (result); + char *result; + int retval = + my_asprintf (&result, "%Lf", data[k].value); + ASSERT (result != NULL); + ASSERT (strmatch (data[k].string, result)); + ASSERT (retval == strlen (result)); + free (result); } } @@ -1314,7 +1315,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%Lf %d", -0.0L, 33, 44, 55); + my_asprintf (&result, "%Lf %d", minus_zerol, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); @@ -1325,10 +1326,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%Lf %d", 1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%Lf %d", Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0 - || strcmp (result, "infinity 33") == 0); + || strcmp (result, "infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1336,27 +1337,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%Lf %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%Lf %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0 - || strcmp (result, "-infinity 33") == 0); + || strcmp (result, "-infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%Lf %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%Lf %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } -#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) +#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE { /* Quiet NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) }; @@ -1365,8 +1365,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1379,8 +1379,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1399,8 +1399,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1412,8 +1412,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1425,8 +1425,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1438,8 +1438,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1451,8 +1451,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1531,23 +1531,22 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015Lf %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%015Lf %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -inf 33") == 0 - || strcmp (result, " -infinity 33") == 0); + || strcmp (result, " -infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* FLAG_ZERO with NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%050Lf %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%050Lf %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1562,6 +1561,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) free (result); } + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2Lf %d", 999.951L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2Lf %d", 999.996L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + /* Test the support of the %F format directive. */ { /* A positive number. */ @@ -1607,7 +1626,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%F %d", -0.0, 33, 44, 55); + my_asprintf (&result, "%F %d", minus_zerod, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); @@ -1618,10 +1637,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%F %d", 1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%F %d", Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "INF 33") == 0 - || strcmp (result, "INFINITY 33") == 0); + || strcmp (result, "INFINITY 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1629,10 +1648,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%F %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%F %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-INF 33") == 0 - || strcmp (result, "-INFINITY 33") == 0); + || strcmp (result, "-INFINITY 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1640,11 +1659,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* NaN. */ char *result; int retval = - my_asprintf (&result, "%F %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%F %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 1) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 1) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1662,10 +1681,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015F %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%015F %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -INF 33") == 0 - || strcmp (result, " -INFINITY 33") == 0); + || strcmp (result, " -INFINITY 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1680,6 +1699,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) free (result); } + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2F %d", 999.951, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2F %d", 999.996, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + { /* A positive number. */ char *result; int retval = @@ -1723,7 +1762,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%LF %d", -0.0L, 33, 44, 55); + my_asprintf (&result, "%LF %d", minus_zerol, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); @@ -1734,10 +1773,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%LF %d", 1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%LF %d", Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "INF 33") == 0 - || strcmp (result, "INFINITY 33") == 0); + || strcmp (result, "INFINITY 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1745,23 +1784,22 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%LF %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%LF %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-INF 33") == 0 - || strcmp (result, "-INFINITY 33") == 0); + || strcmp (result, "-INFINITY 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%LF %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%LF %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 1) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 1) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1779,10 +1817,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015LF %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%015LF %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -INF 33") == 0 - || strcmp (result, " -INFINITY 33") == 0); + || strcmp (result, " -INFINITY 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1797,6 +1835,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) free (result); } + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2LF %d", 999.951L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.2LF %d", 999.996L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + /* Test the support of the %e format directive. */ { /* A positive number. */ @@ -1805,7 +1863,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%e %d", 12.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.275000e+01 33") == 0 - || strcmp (result, "1.275000e+001 33") == 0); + || strcmp (result, "1.275000e+001 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1816,7 +1874,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%e %d", 1234567.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.234567e+06 33") == 0 - || strcmp (result, "1.234567e+006 33") == 0); + || strcmp (result, "1.234567e+006 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1824,99 +1882,99 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Small and large positive numbers. */ static struct { double value; const char *string; } data[] = { - { 1.234321234321234e-37, "1.234321e-37" }, - { 1.234321234321234e-36, "1.234321e-36" }, - { 1.234321234321234e-35, "1.234321e-35" }, - { 1.234321234321234e-34, "1.234321e-34" }, - { 1.234321234321234e-33, "1.234321e-33" }, - { 1.234321234321234e-32, "1.234321e-32" }, - { 1.234321234321234e-31, "1.234321e-31" }, - { 1.234321234321234e-30, "1.234321e-30" }, - { 1.234321234321234e-29, "1.234321e-29" }, - { 1.234321234321234e-28, "1.234321e-28" }, - { 1.234321234321234e-27, "1.234321e-27" }, - { 1.234321234321234e-26, "1.234321e-26" }, - { 1.234321234321234e-25, "1.234321e-25" }, - { 1.234321234321234e-24, "1.234321e-24" }, - { 1.234321234321234e-23, "1.234321e-23" }, - { 1.234321234321234e-22, "1.234321e-22" }, - { 1.234321234321234e-21, "1.234321e-21" }, - { 1.234321234321234e-20, "1.234321e-20" }, - { 1.234321234321234e-19, "1.234321e-19" }, - { 1.234321234321234e-18, "1.234321e-18" }, - { 1.234321234321234e-17, "1.234321e-17" }, - { 1.234321234321234e-16, "1.234321e-16" }, - { 1.234321234321234e-15, "1.234321e-15" }, - { 1.234321234321234e-14, "1.234321e-14" }, - { 1.234321234321234e-13, "1.234321e-13" }, - { 1.234321234321234e-12, "1.234321e-12" }, - { 1.234321234321234e-11, "1.234321e-11" }, - { 1.234321234321234e-10, "1.234321e-10" }, - { 1.234321234321234e-9, "1.234321e-09" }, - { 1.234321234321234e-8, "1.234321e-08" }, - { 1.234321234321234e-7, "1.234321e-07" }, - { 1.234321234321234e-6, "1.234321e-06" }, - { 1.234321234321234e-5, "1.234321e-05" }, - { 1.234321234321234e-4, "1.234321e-04" }, - { 1.234321234321234e-3, "1.234321e-03" }, - { 1.234321234321234e-2, "1.234321e-02" }, - { 1.234321234321234e-1, "1.234321e-01" }, - { 1.234321234321234, "1.234321e+00" }, - { 1.234321234321234e1, "1.234321e+01" }, - { 1.234321234321234e2, "1.234321e+02" }, - { 1.234321234321234e3, "1.234321e+03" }, - { 1.234321234321234e4, "1.234321e+04" }, - { 1.234321234321234e5, "1.234321e+05" }, - { 1.234321234321234e6, "1.234321e+06" }, - { 1.234321234321234e7, "1.234321e+07" }, - { 1.234321234321234e8, "1.234321e+08" }, - { 1.234321234321234e9, "1.234321e+09" }, - { 1.234321234321234e10, "1.234321e+10" }, - { 1.234321234321234e11, "1.234321e+11" }, - { 1.234321234321234e12, "1.234321e+12" }, - { 1.234321234321234e13, "1.234321e+13" }, - { 1.234321234321234e14, "1.234321e+14" }, - { 1.234321234321234e15, "1.234321e+15" }, - { 1.234321234321234e16, "1.234321e+16" }, - { 1.234321234321234e17, "1.234321e+17" }, - { 1.234321234321234e18, "1.234321e+18" }, - { 1.234321234321234e19, "1.234321e+19" }, - { 1.234321234321234e20, "1.234321e+20" }, - { 1.234321234321234e21, "1.234321e+21" }, - { 1.234321234321234e22, "1.234321e+22" }, - { 1.234321234321234e23, "1.234321e+23" }, - { 1.234321234321234e24, "1.234321e+24" }, - { 1.234321234321234e25, "1.234321e+25" }, - { 1.234321234321234e26, "1.234321e+26" }, - { 1.234321234321234e27, "1.234321e+27" }, - { 1.234321234321234e28, "1.234321e+28" }, - { 1.234321234321234e29, "1.234321e+29" }, - { 1.234321234321234e30, "1.234321e+30" }, - { 1.234321234321234e31, "1.234321e+31" }, - { 1.234321234321234e32, "1.234321e+32" }, - { 1.234321234321234e33, "1.234321e+33" }, - { 1.234321234321234e34, "1.234321e+34" }, - { 1.234321234321234e35, "1.234321e+35" }, - { 1.234321234321234e36, "1.234321e+36" } + { 1.234321234321234e-37, "1.234321e-37" }, + { 1.234321234321234e-36, "1.234321e-36" }, + { 1.234321234321234e-35, "1.234321e-35" }, + { 1.234321234321234e-34, "1.234321e-34" }, + { 1.234321234321234e-33, "1.234321e-33" }, + { 1.234321234321234e-32, "1.234321e-32" }, + { 1.234321234321234e-31, "1.234321e-31" }, + { 1.234321234321234e-30, "1.234321e-30" }, + { 1.234321234321234e-29, "1.234321e-29" }, + { 1.234321234321234e-28, "1.234321e-28" }, + { 1.234321234321234e-27, "1.234321e-27" }, + { 1.234321234321234e-26, "1.234321e-26" }, + { 1.234321234321234e-25, "1.234321e-25" }, + { 1.234321234321234e-24, "1.234321e-24" }, + { 1.234321234321234e-23, "1.234321e-23" }, + { 1.234321234321234e-22, "1.234321e-22" }, + { 1.234321234321234e-21, "1.234321e-21" }, + { 1.234321234321234e-20, "1.234321e-20" }, + { 1.234321234321234e-19, "1.234321e-19" }, + { 1.234321234321234e-18, "1.234321e-18" }, + { 1.234321234321234e-17, "1.234321e-17" }, + { 1.234321234321234e-16, "1.234321e-16" }, + { 1.234321234321234e-15, "1.234321e-15" }, + { 1.234321234321234e-14, "1.234321e-14" }, + { 1.234321234321234e-13, "1.234321e-13" }, + { 1.234321234321234e-12, "1.234321e-12" }, + { 1.234321234321234e-11, "1.234321e-11" }, + { 1.234321234321234e-10, "1.234321e-10" }, + { 1.234321234321234e-9, "1.234321e-09" }, + { 1.234321234321234e-8, "1.234321e-08" }, + { 1.234321234321234e-7, "1.234321e-07" }, + { 1.234321234321234e-6, "1.234321e-06" }, + { 1.234321234321234e-5, "1.234321e-05" }, + { 1.234321234321234e-4, "1.234321e-04" }, + { 1.234321234321234e-3, "1.234321e-03" }, + { 1.234321234321234e-2, "1.234321e-02" }, + { 1.234321234321234e-1, "1.234321e-01" }, + { 1.234321234321234, "1.234321e+00" }, + { 1.234321234321234e1, "1.234321e+01" }, + { 1.234321234321234e2, "1.234321e+02" }, + { 1.234321234321234e3, "1.234321e+03" }, + { 1.234321234321234e4, "1.234321e+04" }, + { 1.234321234321234e5, "1.234321e+05" }, + { 1.234321234321234e6, "1.234321e+06" }, + { 1.234321234321234e7, "1.234321e+07" }, + { 1.234321234321234e8, "1.234321e+08" }, + { 1.234321234321234e9, "1.234321e+09" }, + { 1.234321234321234e10, "1.234321e+10" }, + { 1.234321234321234e11, "1.234321e+11" }, + { 1.234321234321234e12, "1.234321e+12" }, + { 1.234321234321234e13, "1.234321e+13" }, + { 1.234321234321234e14, "1.234321e+14" }, + { 1.234321234321234e15, "1.234321e+15" }, + { 1.234321234321234e16, "1.234321e+16" }, + { 1.234321234321234e17, "1.234321e+17" }, + { 1.234321234321234e18, "1.234321e+18" }, + { 1.234321234321234e19, "1.234321e+19" }, + { 1.234321234321234e20, "1.234321e+20" }, + { 1.234321234321234e21, "1.234321e+21" }, + { 1.234321234321234e22, "1.234321e+22" }, + { 1.234321234321234e23, "1.234321e+23" }, + { 1.234321234321234e24, "1.234321e+24" }, + { 1.234321234321234e25, "1.234321e+25" }, + { 1.234321234321234e26, "1.234321e+26" }, + { 1.234321234321234e27, "1.234321e+27" }, + { 1.234321234321234e28, "1.234321e+28" }, + { 1.234321234321234e29, "1.234321e+29" }, + { 1.234321234321234e30, "1.234321e+30" }, + { 1.234321234321234e31, "1.234321e+31" }, + { 1.234321234321234e32, "1.234321e+32" }, + { 1.234321234321234e33, "1.234321e+33" }, + { 1.234321234321234e34, "1.234321e+34" }, + { 1.234321234321234e35, "1.234321e+35" }, + { 1.234321234321234e36, "1.234321e+36" } }; size_t k; for (k = 0; k < SIZEOF (data); k++) { - char *result; - int retval = - my_asprintf (&result, "%e", data[k].value); - const char *expected = data[k].string; - ASSERT (result != NULL); - ASSERT (strcmp (result, expected) == 0 - /* Some implementations produce exponents with 3 digits. */ - || (strlen (result) == strlen (expected) + 1 - && memcmp (result, expected, strlen (expected) - 2) == 0 - && result[strlen (expected) - 2] == '0' - && strcmp (result + strlen (expected) - 1, - expected + strlen (expected) - 2) - == 0)); - ASSERT (retval == strlen (result)); - free (result); + char *result; + int retval = + my_asprintf (&result, "%e", data[k].value); + const char *expected = data[k].string; + ASSERT (result != NULL); + ASSERT (strcmp (result, expected) == 0 + /* Some implementations produce exponents with 3 digits. */ + || (strlen (result) == strlen (expected) + 1 + && memcmp (result, expected, strlen (expected) - 2) == 0 + && result[strlen (expected) - 2] == '0' + && strcmp (result + strlen (expected) - 1, + expected + strlen (expected) - 2) + == 0)); + ASSERT (retval == strlen (result)); + free (result); } } @@ -1926,7 +1984,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%e %d", -0.03125, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-3.125000e-02 33") == 0 - || strcmp (result, "-3.125000e-002 33") == 0); + || strcmp (result, "-3.125000e-002 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1937,7 +1995,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%e %d", 0.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0.000000e+00 33") == 0 - || strcmp (result, "0.000000e+000 33") == 0); + || strcmp (result, "0.000000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1945,11 +2003,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%e %d", -0.0, 33, 44, 55); + my_asprintf (&result, "%e %d", minus_zerod, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000e+00 33") == 0 - || strcmp (result, "-0.000000e+000 33") == 0); + || strcmp (result, "-0.000000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1957,10 +2015,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%e %d", 1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%e %d", Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0 - || strcmp (result, "infinity 33") == 0); + || strcmp (result, "infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1968,10 +2026,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%e %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%e %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0 - || strcmp (result, "-infinity 33") == 0); + || strcmp (result, "-infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1979,11 +2037,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* NaN. */ char *result; int retval = - my_asprintf (&result, "%e %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%e %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -1994,7 +2052,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%15e %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " 1.750000e+00 33") == 0 - || strcmp (result, " 1.750000e+000 33") == 0); + || strcmp (result, " 1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2005,7 +2063,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%-15e %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.750000e+00 33") == 0 - || strcmp (result, "1.750000e+000 33") == 0); + || strcmp (result, "1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2016,7 +2074,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%+e %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "+1.750000e+00 33") == 0 - || strcmp (result, "+1.750000e+000 33") == 0); + || strcmp (result, "+1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2027,7 +2085,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "% e %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " 1.750000e+00 33") == 0 - || strcmp (result, " 1.750000e+000 33") == 0); + || strcmp (result, " 1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2038,7 +2096,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#e %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.750000e+00 33") == 0 - || strcmp (result, "1.750000e+000 33") == 0); + || strcmp (result, "1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2049,7 +2107,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#.e %d", 1.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "2.e+00 33") == 0 - || strcmp (result, "2.e+000 33") == 0); + || strcmp (result, "2.e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2060,7 +2118,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#.e %d", 9.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.e+01 33") == 0 - || strcmp (result, "1.e+001 33") == 0); + || strcmp (result, "1.e+001 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2071,7 +2129,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%015e %d", 1234.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "0001.234000e+03 33") == 0 - || strcmp (result, "001.234000e+003 33") == 0); + || strcmp (result, "001.234000e+003 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2079,10 +2137,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015e %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%015e %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -inf 33") == 0 - || strcmp (result, " -infinity 33") == 0); + || strcmp (result, " -infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2090,11 +2148,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with NaN. */ char *result; int retval = - my_asprintf (&result, "%050e %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%050e %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2105,7 +2163,29 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.e %d", 1234.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1e+03 33") == 0 - || strcmp (result, "1e+003 33") == 0); + || strcmp (result, "1e+003 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.4e %d", 999.951, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "9.9995e+02 33") == 0 + || strcmp (result, "9.9995e+002 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.4e %d", 999.996, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1.0000e+03 33") == 0 + || strcmp (result, "1.0000e+003 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2115,7 +2195,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", 12.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.275000e+01 33") == 0); + ASSERT (strcmp (result, "1.275000e+01 33") == 0 + || strcmp (result, "1.275000e+001 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2125,7 +2206,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", 1234567.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.234567e+06 33") == 0); + ASSERT (strcmp (result, "1.234567e+06 33") == 0 + || strcmp (result, "1.234567e+006 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2133,91 +2215,99 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Small and large positive numbers. */ static struct { long double value; const char *string; } data[] = { - { 1.234321234321234e-37L, "1.234321e-37" }, - { 1.234321234321234e-36L, "1.234321e-36" }, - { 1.234321234321234e-35L, "1.234321e-35" }, - { 1.234321234321234e-34L, "1.234321e-34" }, - { 1.234321234321234e-33L, "1.234321e-33" }, - { 1.234321234321234e-32L, "1.234321e-32" }, - { 1.234321234321234e-31L, "1.234321e-31" }, - { 1.234321234321234e-30L, "1.234321e-30" }, - { 1.234321234321234e-29L, "1.234321e-29" }, - { 1.234321234321234e-28L, "1.234321e-28" }, - { 1.234321234321234e-27L, "1.234321e-27" }, - { 1.234321234321234e-26L, "1.234321e-26" }, - { 1.234321234321234e-25L, "1.234321e-25" }, - { 1.234321234321234e-24L, "1.234321e-24" }, - { 1.234321234321234e-23L, "1.234321e-23" }, - { 1.234321234321234e-22L, "1.234321e-22" }, - { 1.234321234321234e-21L, "1.234321e-21" }, - { 1.234321234321234e-20L, "1.234321e-20" }, - { 1.234321234321234e-19L, "1.234321e-19" }, - { 1.234321234321234e-18L, "1.234321e-18" }, - { 1.234321234321234e-17L, "1.234321e-17" }, - { 1.234321234321234e-16L, "1.234321e-16" }, - { 1.234321234321234e-15L, "1.234321e-15" }, - { 1.234321234321234e-14L, "1.234321e-14" }, - { 1.234321234321234e-13L, "1.234321e-13" }, - { 1.234321234321234e-12L, "1.234321e-12" }, - { 1.234321234321234e-11L, "1.234321e-11" }, - { 1.234321234321234e-10L, "1.234321e-10" }, - { 1.234321234321234e-9L, "1.234321e-09" }, - { 1.234321234321234e-8L, "1.234321e-08" }, - { 1.234321234321234e-7L, "1.234321e-07" }, - { 1.234321234321234e-6L, "1.234321e-06" }, - { 1.234321234321234e-5L, "1.234321e-05" }, - { 1.234321234321234e-4L, "1.234321e-04" }, - { 1.234321234321234e-3L, "1.234321e-03" }, - { 1.234321234321234e-2L, "1.234321e-02" }, - { 1.234321234321234e-1L, "1.234321e-01" }, - { 1.234321234321234L, "1.234321e+00" }, - { 1.234321234321234e1L, "1.234321e+01" }, - { 1.234321234321234e2L, "1.234321e+02" }, - { 1.234321234321234e3L, "1.234321e+03" }, - { 1.234321234321234e4L, "1.234321e+04" }, - { 1.234321234321234e5L, "1.234321e+05" }, - { 1.234321234321234e6L, "1.234321e+06" }, - { 1.234321234321234e7L, "1.234321e+07" }, - { 1.234321234321234e8L, "1.234321e+08" }, - { 1.234321234321234e9L, "1.234321e+09" }, - { 1.234321234321234e10L, "1.234321e+10" }, - { 1.234321234321234e11L, "1.234321e+11" }, - { 1.234321234321234e12L, "1.234321e+12" }, - { 1.234321234321234e13L, "1.234321e+13" }, - { 1.234321234321234e14L, "1.234321e+14" }, - { 1.234321234321234e15L, "1.234321e+15" }, - { 1.234321234321234e16L, "1.234321e+16" }, - { 1.234321234321234e17L, "1.234321e+17" }, - { 1.234321234321234e18L, "1.234321e+18" }, - { 1.234321234321234e19L, "1.234321e+19" }, - { 1.234321234321234e20L, "1.234321e+20" }, - { 1.234321234321234e21L, "1.234321e+21" }, - { 1.234321234321234e22L, "1.234321e+22" }, - { 1.234321234321234e23L, "1.234321e+23" }, - { 1.234321234321234e24L, "1.234321e+24" }, - { 1.234321234321234e25L, "1.234321e+25" }, - { 1.234321234321234e26L, "1.234321e+26" }, - { 1.234321234321234e27L, "1.234321e+27" }, - { 1.234321234321234e28L, "1.234321e+28" }, - { 1.234321234321234e29L, "1.234321e+29" }, - { 1.234321234321234e30L, "1.234321e+30" }, - { 1.234321234321234e31L, "1.234321e+31" }, - { 1.234321234321234e32L, "1.234321e+32" }, - { 1.234321234321234e33L, "1.234321e+33" }, - { 1.234321234321234e34L, "1.234321e+34" }, - { 1.234321234321234e35L, "1.234321e+35" }, - { 1.234321234321234e36L, "1.234321e+36" } + { 1.234321234321234e-37L, "1.234321e-37" }, + { 1.234321234321234e-36L, "1.234321e-36" }, + { 1.234321234321234e-35L, "1.234321e-35" }, + { 1.234321234321234e-34L, "1.234321e-34" }, + { 1.234321234321234e-33L, "1.234321e-33" }, + { 1.234321234321234e-32L, "1.234321e-32" }, + { 1.234321234321234e-31L, "1.234321e-31" }, + { 1.234321234321234e-30L, "1.234321e-30" }, + { 1.234321234321234e-29L, "1.234321e-29" }, + { 1.234321234321234e-28L, "1.234321e-28" }, + { 1.234321234321234e-27L, "1.234321e-27" }, + { 1.234321234321234e-26L, "1.234321e-26" }, + { 1.234321234321234e-25L, "1.234321e-25" }, + { 1.234321234321234e-24L, "1.234321e-24" }, + { 1.234321234321234e-23L, "1.234321e-23" }, + { 1.234321234321234e-22L, "1.234321e-22" }, + { 1.234321234321234e-21L, "1.234321e-21" }, + { 1.234321234321234e-20L, "1.234321e-20" }, + { 1.234321234321234e-19L, "1.234321e-19" }, + { 1.234321234321234e-18L, "1.234321e-18" }, + { 1.234321234321234e-17L, "1.234321e-17" }, + { 1.234321234321234e-16L, "1.234321e-16" }, + { 1.234321234321234e-15L, "1.234321e-15" }, + { 1.234321234321234e-14L, "1.234321e-14" }, + { 1.234321234321234e-13L, "1.234321e-13" }, + { 1.234321234321234e-12L, "1.234321e-12" }, + { 1.234321234321234e-11L, "1.234321e-11" }, + { 1.234321234321234e-10L, "1.234321e-10" }, + { 1.234321234321234e-9L, "1.234321e-09" }, + { 1.234321234321234e-8L, "1.234321e-08" }, + { 1.234321234321234e-7L, "1.234321e-07" }, + { 1.234321234321234e-6L, "1.234321e-06" }, + { 1.234321234321234e-5L, "1.234321e-05" }, + { 1.234321234321234e-4L, "1.234321e-04" }, + { 1.234321234321234e-3L, "1.234321e-03" }, + { 1.234321234321234e-2L, "1.234321e-02" }, + { 1.234321234321234e-1L, "1.234321e-01" }, + { 1.234321234321234L, "1.234321e+00" }, + { 1.234321234321234e1L, "1.234321e+01" }, + { 1.234321234321234e2L, "1.234321e+02" }, + { 1.234321234321234e3L, "1.234321e+03" }, + { 1.234321234321234e4L, "1.234321e+04" }, + { 1.234321234321234e5L, "1.234321e+05" }, + { 1.234321234321234e6L, "1.234321e+06" }, + { 1.234321234321234e7L, "1.234321e+07" }, + { 1.234321234321234e8L, "1.234321e+08" }, + { 1.234321234321234e9L, "1.234321e+09" }, + { 1.234321234321234e10L, "1.234321e+10" }, + { 1.234321234321234e11L, "1.234321e+11" }, + { 1.234321234321234e12L, "1.234321e+12" }, + { 1.234321234321234e13L, "1.234321e+13" }, + { 1.234321234321234e14L, "1.234321e+14" }, + { 1.234321234321234e15L, "1.234321e+15" }, + { 1.234321234321234e16L, "1.234321e+16" }, + { 1.234321234321234e17L, "1.234321e+17" }, + { 1.234321234321234e18L, "1.234321e+18" }, + { 1.234321234321234e19L, "1.234321e+19" }, + { 1.234321234321234e20L, "1.234321e+20" }, + { 1.234321234321234e21L, "1.234321e+21" }, + { 1.234321234321234e22L, "1.234321e+22" }, + { 1.234321234321234e23L, "1.234321e+23" }, + { 1.234321234321234e24L, "1.234321e+24" }, + { 1.234321234321234e25L, "1.234321e+25" }, + { 1.234321234321234e26L, "1.234321e+26" }, + { 1.234321234321234e27L, "1.234321e+27" }, + { 1.234321234321234e28L, "1.234321e+28" }, + { 1.234321234321234e29L, "1.234321e+29" }, + { 1.234321234321234e30L, "1.234321e+30" }, + { 1.234321234321234e31L, "1.234321e+31" }, + { 1.234321234321234e32L, "1.234321e+32" }, + { 1.234321234321234e33L, "1.234321e+33" }, + { 1.234321234321234e34L, "1.234321e+34" }, + { 1.234321234321234e35L, "1.234321e+35" }, + { 1.234321234321234e36L, "1.234321e+36" } }; size_t k; for (k = 0; k < SIZEOF (data); k++) { - char *result; - int retval = - my_asprintf (&result, "%Le", data[k].value); - ASSERT (result != NULL); - ASSERT (strcmp (result, data[k].string) == 0); - ASSERT (retval == strlen (result)); - free (result); + char *result; + int retval = + my_asprintf (&result, "%Le", data[k].value); + const char *expected = data[k].string; + ASSERT (result != NULL); + ASSERT (strcmp (result, expected) == 0 + /* Some implementations produce exponents with 3 digits. */ + || (strlen (result) == strlen (expected) + 1 + && memcmp (result, expected, strlen (expected) - 2) == 0 + && result[strlen (expected) - 2] == '0' + && strcmp (result + strlen (expected) - 1, + expected + strlen (expected) - 2) + == 0)); + ASSERT (retval == strlen (result)); + free (result); } } @@ -2226,7 +2316,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", -0.03125L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "-3.125000e-02 33") == 0); + ASSERT (strcmp (result, "-3.125000e-02 33") == 0 + || strcmp (result, "-3.125000e-002 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2236,7 +2327,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", 0.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "0.000000e+00 33") == 0); + ASSERT (strcmp (result, "0.000000e+00 33") == 0 + || strcmp (result, "0.000000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2244,10 +2336,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%Le %d", -0.0L, 33, 44, 55); + my_asprintf (&result, "%Le %d", minus_zerol, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) - ASSERT (strcmp (result, "-0.000000e+00 33") == 0); + ASSERT (strcmp (result, "-0.000000e+00 33") == 0 + || strcmp (result, "-0.000000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2255,10 +2348,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%Le %d", 1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%Le %d", Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0 - || strcmp (result, "infinity 33") == 0); + || strcmp (result, "infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2266,27 +2359,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%Le %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%Le %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0 - || strcmp (result, "-infinity 33") == 0); + || strcmp (result, "-infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%Le %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%Le %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } -#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) +#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE { /* Quiet NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) }; @@ -2295,8 +2387,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2309,8 +2401,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2329,8 +2421,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2342,8 +2434,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2355,8 +2447,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2368,8 +2460,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2381,8 +2473,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2393,7 +2485,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%15Le %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " 1.750000e+00 33") == 0); + ASSERT (strcmp (result, " 1.750000e+00 33") == 0 + || strcmp (result, " 1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2403,7 +2496,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%-15Le %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.750000e+00 33") == 0); + ASSERT (strcmp (result, "1.750000e+00 33") == 0 + || strcmp (result, "1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2413,7 +2507,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%+Le %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "+1.750000e+00 33") == 0); + ASSERT (strcmp (result, "+1.750000e+00 33") == 0 + || strcmp (result, "+1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2423,7 +2518,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "% Le %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " 1.750000e+00 33") == 0); + ASSERT (strcmp (result, " 1.750000e+00 33") == 0 + || strcmp (result, " 1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2433,7 +2529,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%#Le %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.750000e+00 33") == 0); + ASSERT (strcmp (result, "1.750000e+00 33") == 0 + || strcmp (result, "1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2443,7 +2540,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%#.Le %d", 1.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "2.e+00 33") == 0); + ASSERT (strcmp (result, "2.e+00 33") == 0 + || strcmp (result, "2.e+000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2453,7 +2551,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%#.Le %d", 9.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.e+01 33") == 0); + ASSERT (strcmp (result, "1.e+01 33") == 0 + || strcmp (result, "1.e+001 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2463,7 +2562,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%015Le %d", 1234.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "0001.234000e+03 33") == 0); + ASSERT (strcmp (result, "0001.234000e+03 33") == 0 + || strcmp (result, "001.234000e+003 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2471,23 +2571,22 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015Le %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%015Le %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -inf 33") == 0 - || strcmp (result, " -infinity 33") == 0); + || strcmp (result, " -infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* FLAG_ZERO with NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%050Le %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%050Le %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2497,7 +2596,30 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%.Le %d", 1234.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1e+03 33") == 0); + ASSERT (strcmp (result, "1e+03 33") == 0 + || strcmp (result, "1e+003 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.4Le %d", 999.951L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "9.9995e+02 33") == 0 + || strcmp (result, "9.9995e+002 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.4Le %d", 999.996L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1.0000e+03 33") == 0 + || strcmp (result, "1.0000e+003 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2520,7 +2642,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%g %d", 1234567.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.23457e+06 33") == 0 - || strcmp (result, "1.23457e+006 33") == 0); + || strcmp (result, "1.23457e+006 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2528,100 +2650,100 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Small and large positive numbers. */ static struct { double value; const char *string; } data[] = { - { 1.234321234321234e-37, "1.23432e-37" }, - { 1.234321234321234e-36, "1.23432e-36" }, - { 1.234321234321234e-35, "1.23432e-35" }, - { 1.234321234321234e-34, "1.23432e-34" }, - { 1.234321234321234e-33, "1.23432e-33" }, - { 1.234321234321234e-32, "1.23432e-32" }, - { 1.234321234321234e-31, "1.23432e-31" }, - { 1.234321234321234e-30, "1.23432e-30" }, - { 1.234321234321234e-29, "1.23432e-29" }, - { 1.234321234321234e-28, "1.23432e-28" }, - { 1.234321234321234e-27, "1.23432e-27" }, - { 1.234321234321234e-26, "1.23432e-26" }, - { 1.234321234321234e-25, "1.23432e-25" }, - { 1.234321234321234e-24, "1.23432e-24" }, - { 1.234321234321234e-23, "1.23432e-23" }, - { 1.234321234321234e-22, "1.23432e-22" }, - { 1.234321234321234e-21, "1.23432e-21" }, - { 1.234321234321234e-20, "1.23432e-20" }, - { 1.234321234321234e-19, "1.23432e-19" }, - { 1.234321234321234e-18, "1.23432e-18" }, - { 1.234321234321234e-17, "1.23432e-17" }, - { 1.234321234321234e-16, "1.23432e-16" }, - { 1.234321234321234e-15, "1.23432e-15" }, - { 1.234321234321234e-14, "1.23432e-14" }, - { 1.234321234321234e-13, "1.23432e-13" }, - { 1.234321234321234e-12, "1.23432e-12" }, - { 1.234321234321234e-11, "1.23432e-11" }, - { 1.234321234321234e-10, "1.23432e-10" }, - { 1.234321234321234e-9, "1.23432e-09" }, - { 1.234321234321234e-8, "1.23432e-08" }, - { 1.234321234321234e-7, "1.23432e-07" }, - { 1.234321234321234e-6, "1.23432e-06" }, - { 1.234321234321234e-5, "1.23432e-05" }, - { 1.234321234321234e-4, "0.000123432" }, - { 1.234321234321234e-3, "0.00123432" }, - { 1.234321234321234e-2, "0.0123432" }, - { 1.234321234321234e-1, "0.123432" }, - { 1.234321234321234, "1.23432" }, - { 1.234321234321234e1, "12.3432" }, - { 1.234321234321234e2, "123.432" }, - { 1.234321234321234e3, "1234.32" }, - { 1.234321234321234e4, "12343.2" }, - { 1.234321234321234e5, "123432" }, - { 1.234321234321234e6, "1.23432e+06" }, - { 1.234321234321234e7, "1.23432e+07" }, - { 1.234321234321234e8, "1.23432e+08" }, - { 1.234321234321234e9, "1.23432e+09" }, - { 1.234321234321234e10, "1.23432e+10" }, - { 1.234321234321234e11, "1.23432e+11" }, - { 1.234321234321234e12, "1.23432e+12" }, - { 1.234321234321234e13, "1.23432e+13" }, - { 1.234321234321234e14, "1.23432e+14" }, - { 1.234321234321234e15, "1.23432e+15" }, - { 1.234321234321234e16, "1.23432e+16" }, - { 1.234321234321234e17, "1.23432e+17" }, - { 1.234321234321234e18, "1.23432e+18" }, - { 1.234321234321234e19, "1.23432e+19" }, - { 1.234321234321234e20, "1.23432e+20" }, - { 1.234321234321234e21, "1.23432e+21" }, - { 1.234321234321234e22, "1.23432e+22" }, - { 1.234321234321234e23, "1.23432e+23" }, - { 1.234321234321234e24, "1.23432e+24" }, - { 1.234321234321234e25, "1.23432e+25" }, - { 1.234321234321234e26, "1.23432e+26" }, - { 1.234321234321234e27, "1.23432e+27" }, - { 1.234321234321234e28, "1.23432e+28" }, - { 1.234321234321234e29, "1.23432e+29" }, - { 1.234321234321234e30, "1.23432e+30" }, - { 1.234321234321234e31, "1.23432e+31" }, - { 1.234321234321234e32, "1.23432e+32" }, - { 1.234321234321234e33, "1.23432e+33" }, - { 1.234321234321234e34, "1.23432e+34" }, - { 1.234321234321234e35, "1.23432e+35" }, - { 1.234321234321234e36, "1.23432e+36" } + { 1.234321234321234e-37, "1.23432e-37" }, + { 1.234321234321234e-36, "1.23432e-36" }, + { 1.234321234321234e-35, "1.23432e-35" }, + { 1.234321234321234e-34, "1.23432e-34" }, + { 1.234321234321234e-33, "1.23432e-33" }, + { 1.234321234321234e-32, "1.23432e-32" }, + { 1.234321234321234e-31, "1.23432e-31" }, + { 1.234321234321234e-30, "1.23432e-30" }, + { 1.234321234321234e-29, "1.23432e-29" }, + { 1.234321234321234e-28, "1.23432e-28" }, + { 1.234321234321234e-27, "1.23432e-27" }, + { 1.234321234321234e-26, "1.23432e-26" }, + { 1.234321234321234e-25, "1.23432e-25" }, + { 1.234321234321234e-24, "1.23432e-24" }, + { 1.234321234321234e-23, "1.23432e-23" }, + { 1.234321234321234e-22, "1.23432e-22" }, + { 1.234321234321234e-21, "1.23432e-21" }, + { 1.234321234321234e-20, "1.23432e-20" }, + { 1.234321234321234e-19, "1.23432e-19" }, + { 1.234321234321234e-18, "1.23432e-18" }, + { 1.234321234321234e-17, "1.23432e-17" }, + { 1.234321234321234e-16, "1.23432e-16" }, + { 1.234321234321234e-15, "1.23432e-15" }, + { 1.234321234321234e-14, "1.23432e-14" }, + { 1.234321234321234e-13, "1.23432e-13" }, + { 1.234321234321234e-12, "1.23432e-12" }, + { 1.234321234321234e-11, "1.23432e-11" }, + { 1.234321234321234e-10, "1.23432e-10" }, + { 1.234321234321234e-9, "1.23432e-09" }, + { 1.234321234321234e-8, "1.23432e-08" }, + { 1.234321234321234e-7, "1.23432e-07" }, + { 1.234321234321234e-6, "1.23432e-06" }, + { 1.234321234321234e-5, "1.23432e-05" }, + { 1.234321234321234e-4, "0.000123432" }, + { 1.234321234321234e-3, "0.00123432" }, + { 1.234321234321234e-2, "0.0123432" }, + { 1.234321234321234e-1, "0.123432" }, + { 1.234321234321234, "1.23432" }, + { 1.234321234321234e1, "12.3432" }, + { 1.234321234321234e2, "123.432" }, + { 1.234321234321234e3, "1234.32" }, + { 1.234321234321234e4, "12343.2" }, + { 1.234321234321234e5, "123432" }, + { 1.234321234321234e6, "1.23432e+06" }, + { 1.234321234321234e7, "1.23432e+07" }, + { 1.234321234321234e8, "1.23432e+08" }, + { 1.234321234321234e9, "1.23432e+09" }, + { 1.234321234321234e10, "1.23432e+10" }, + { 1.234321234321234e11, "1.23432e+11" }, + { 1.234321234321234e12, "1.23432e+12" }, + { 1.234321234321234e13, "1.23432e+13" }, + { 1.234321234321234e14, "1.23432e+14" }, + { 1.234321234321234e15, "1.23432e+15" }, + { 1.234321234321234e16, "1.23432e+16" }, + { 1.234321234321234e17, "1.23432e+17" }, + { 1.234321234321234e18, "1.23432e+18" }, + { 1.234321234321234e19, "1.23432e+19" }, + { 1.234321234321234e20, "1.23432e+20" }, + { 1.234321234321234e21, "1.23432e+21" }, + { 1.234321234321234e22, "1.23432e+22" }, + { 1.234321234321234e23, "1.23432e+23" }, + { 1.234321234321234e24, "1.23432e+24" }, + { 1.234321234321234e25, "1.23432e+25" }, + { 1.234321234321234e26, "1.23432e+26" }, + { 1.234321234321234e27, "1.23432e+27" }, + { 1.234321234321234e28, "1.23432e+28" }, + { 1.234321234321234e29, "1.23432e+29" }, + { 1.234321234321234e30, "1.23432e+30" }, + { 1.234321234321234e31, "1.23432e+31" }, + { 1.234321234321234e32, "1.23432e+32" }, + { 1.234321234321234e33, "1.23432e+33" }, + { 1.234321234321234e34, "1.23432e+34" }, + { 1.234321234321234e35, "1.23432e+35" }, + { 1.234321234321234e36, "1.23432e+36" } }; size_t k; for (k = 0; k < SIZEOF (data); k++) { - char *result; - int retval = - my_asprintf (&result, "%g", data[k].value); - const char *expected = data[k].string; - ASSERT (result != NULL); - ASSERT (strcmp (result, expected) == 0 - /* Some implementations produce exponents with 3 digits. */ - || (expected[strlen (expected) - 4] == 'e' - && strlen (result) == strlen (expected) + 1 - && memcmp (result, expected, strlen (expected) - 2) == 0 - && result[strlen (expected) - 2] == '0' - && strcmp (result + strlen (expected) - 1, - expected + strlen (expected) - 2) - == 0)); - ASSERT (retval == strlen (result)); - free (result); + char *result; + int retval = + my_asprintf (&result, "%g", data[k].value); + const char *expected = data[k].string; + ASSERT (result != NULL); + ASSERT (strcmp (result, expected) == 0 + /* Some implementations produce exponents with 3 digits. */ + || (expected[strlen (expected) - 4] == 'e' + && strlen (result) == strlen (expected) + 1 + && memcmp (result, expected, strlen (expected) - 2) == 0 + && result[strlen (expected) - 2] == '0' + && strcmp (result + strlen (expected) - 1, + expected + strlen (expected) - 2) + == 0)); + ASSERT (retval == strlen (result)); + free (result); } } @@ -2648,7 +2770,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%g %d", -0.0, 33, 44, 55); + my_asprintf (&result, "%g %d", minus_zerod, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0 33") == 0); @@ -2659,10 +2781,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%g %d", 1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%g %d", Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0 - || strcmp (result, "infinity 33") == 0); + || strcmp (result, "infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2670,10 +2792,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%g %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%g %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0 - || strcmp (result, "-infinity 33") == 0); + || strcmp (result, "-infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2681,11 +2803,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* NaN. */ char *result; int retval = - my_asprintf (&result, "%g %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%g %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2756,7 +2878,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%#.g %d", 9.75, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1.e+01 33") == 0 - || strcmp (result, "1.e+001 33") == 0); + || strcmp (result, "1.e+001 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2774,10 +2896,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015g %d", -1.0 / 0.0, 33, 44, 55); + my_asprintf (&result, "%015g %d", - Infinityd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -inf 33") == 0 - || strcmp (result, " -infinity 33") == 0); + || strcmp (result, " -infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2785,11 +2907,11 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with NaN. */ char *result; int retval = - my_asprintf (&result, "%050g %d", NaN (), 33, 44, 55); + my_asprintf (&result, "%050g %d", NaNd (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2800,7 +2922,27 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%.g %d", 1234.0, 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "1e+03 33") == 0 - || strcmp (result, "1e+003 33") == 0); + || strcmp (result, "1e+003 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.5g %d", 999.951, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.5g %d", 999.996, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2820,7 +2962,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lg %d", 1234567.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.23457e+06 33") == 0); + ASSERT (strcmp (result, "1.23457e+06 33") == 0 + || strcmp (result, "1.23457e+006 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2828,91 +2971,100 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Small and large positive numbers. */ static struct { long double value; const char *string; } data[] = { - { 1.234321234321234e-37L, "1.23432e-37" }, - { 1.234321234321234e-36L, "1.23432e-36" }, - { 1.234321234321234e-35L, "1.23432e-35" }, - { 1.234321234321234e-34L, "1.23432e-34" }, - { 1.234321234321234e-33L, "1.23432e-33" }, - { 1.234321234321234e-32L, "1.23432e-32" }, - { 1.234321234321234e-31L, "1.23432e-31" }, - { 1.234321234321234e-30L, "1.23432e-30" }, - { 1.234321234321234e-29L, "1.23432e-29" }, - { 1.234321234321234e-28L, "1.23432e-28" }, - { 1.234321234321234e-27L, "1.23432e-27" }, - { 1.234321234321234e-26L, "1.23432e-26" }, - { 1.234321234321234e-25L, "1.23432e-25" }, - { 1.234321234321234e-24L, "1.23432e-24" }, - { 1.234321234321234e-23L, "1.23432e-23" }, - { 1.234321234321234e-22L, "1.23432e-22" }, - { 1.234321234321234e-21L, "1.23432e-21" }, - { 1.234321234321234e-20L, "1.23432e-20" }, - { 1.234321234321234e-19L, "1.23432e-19" }, - { 1.234321234321234e-18L, "1.23432e-18" }, - { 1.234321234321234e-17L, "1.23432e-17" }, - { 1.234321234321234e-16L, "1.23432e-16" }, - { 1.234321234321234e-15L, "1.23432e-15" }, - { 1.234321234321234e-14L, "1.23432e-14" }, - { 1.234321234321234e-13L, "1.23432e-13" }, - { 1.234321234321234e-12L, "1.23432e-12" }, - { 1.234321234321234e-11L, "1.23432e-11" }, - { 1.234321234321234e-10L, "1.23432e-10" }, - { 1.234321234321234e-9L, "1.23432e-09" }, - { 1.234321234321234e-8L, "1.23432e-08" }, - { 1.234321234321234e-7L, "1.23432e-07" }, - { 1.234321234321234e-6L, "1.23432e-06" }, - { 1.234321234321234e-5L, "1.23432e-05" }, - { 1.234321234321234e-4L, "0.000123432" }, - { 1.234321234321234e-3L, "0.00123432" }, - { 1.234321234321234e-2L, "0.0123432" }, - { 1.234321234321234e-1L, "0.123432" }, - { 1.234321234321234L, "1.23432" }, - { 1.234321234321234e1L, "12.3432" }, - { 1.234321234321234e2L, "123.432" }, - { 1.234321234321234e3L, "1234.32" }, - { 1.234321234321234e4L, "12343.2" }, - { 1.234321234321234e5L, "123432" }, - { 1.234321234321234e6L, "1.23432e+06" }, - { 1.234321234321234e7L, "1.23432e+07" }, - { 1.234321234321234e8L, "1.23432e+08" }, - { 1.234321234321234e9L, "1.23432e+09" }, - { 1.234321234321234e10L, "1.23432e+10" }, - { 1.234321234321234e11L, "1.23432e+11" }, - { 1.234321234321234e12L, "1.23432e+12" }, - { 1.234321234321234e13L, "1.23432e+13" }, - { 1.234321234321234e14L, "1.23432e+14" }, - { 1.234321234321234e15L, "1.23432e+15" }, - { 1.234321234321234e16L, "1.23432e+16" }, - { 1.234321234321234e17L, "1.23432e+17" }, - { 1.234321234321234e18L, "1.23432e+18" }, - { 1.234321234321234e19L, "1.23432e+19" }, - { 1.234321234321234e20L, "1.23432e+20" }, - { 1.234321234321234e21L, "1.23432e+21" }, - { 1.234321234321234e22L, "1.23432e+22" }, - { 1.234321234321234e23L, "1.23432e+23" }, - { 1.234321234321234e24L, "1.23432e+24" }, - { 1.234321234321234e25L, "1.23432e+25" }, - { 1.234321234321234e26L, "1.23432e+26" }, - { 1.234321234321234e27L, "1.23432e+27" }, - { 1.234321234321234e28L, "1.23432e+28" }, - { 1.234321234321234e29L, "1.23432e+29" }, - { 1.234321234321234e30L, "1.23432e+30" }, - { 1.234321234321234e31L, "1.23432e+31" }, - { 1.234321234321234e32L, "1.23432e+32" }, - { 1.234321234321234e33L, "1.23432e+33" }, - { 1.234321234321234e34L, "1.23432e+34" }, - { 1.234321234321234e35L, "1.23432e+35" }, - { 1.234321234321234e36L, "1.23432e+36" } + { 1.234321234321234e-37L, "1.23432e-37" }, + { 1.234321234321234e-36L, "1.23432e-36" }, + { 1.234321234321234e-35L, "1.23432e-35" }, + { 1.234321234321234e-34L, "1.23432e-34" }, + { 1.234321234321234e-33L, "1.23432e-33" }, + { 1.234321234321234e-32L, "1.23432e-32" }, + { 1.234321234321234e-31L, "1.23432e-31" }, + { 1.234321234321234e-30L, "1.23432e-30" }, + { 1.234321234321234e-29L, "1.23432e-29" }, + { 1.234321234321234e-28L, "1.23432e-28" }, + { 1.234321234321234e-27L, "1.23432e-27" }, + { 1.234321234321234e-26L, "1.23432e-26" }, + { 1.234321234321234e-25L, "1.23432e-25" }, + { 1.234321234321234e-24L, "1.23432e-24" }, + { 1.234321234321234e-23L, "1.23432e-23" }, + { 1.234321234321234e-22L, "1.23432e-22" }, + { 1.234321234321234e-21L, "1.23432e-21" }, + { 1.234321234321234e-20L, "1.23432e-20" }, + { 1.234321234321234e-19L, "1.23432e-19" }, + { 1.234321234321234e-18L, "1.23432e-18" }, + { 1.234321234321234e-17L, "1.23432e-17" }, + { 1.234321234321234e-16L, "1.23432e-16" }, + { 1.234321234321234e-15L, "1.23432e-15" }, + { 1.234321234321234e-14L, "1.23432e-14" }, + { 1.234321234321234e-13L, "1.23432e-13" }, + { 1.234321234321234e-12L, "1.23432e-12" }, + { 1.234321234321234e-11L, "1.23432e-11" }, + { 1.234321234321234e-10L, "1.23432e-10" }, + { 1.234321234321234e-9L, "1.23432e-09" }, + { 1.234321234321234e-8L, "1.23432e-08" }, + { 1.234321234321234e-7L, "1.23432e-07" }, + { 1.234321234321234e-6L, "1.23432e-06" }, + { 1.234321234321234e-5L, "1.23432e-05" }, + { 1.234321234321234e-4L, "0.000123432" }, + { 1.234321234321234e-3L, "0.00123432" }, + { 1.234321234321234e-2L, "0.0123432" }, + { 1.234321234321234e-1L, "0.123432" }, + { 1.234321234321234L, "1.23432" }, + { 1.234321234321234e1L, "12.3432" }, + { 1.234321234321234e2L, "123.432" }, + { 1.234321234321234e3L, "1234.32" }, + { 1.234321234321234e4L, "12343.2" }, + { 1.234321234321234e5L, "123432" }, + { 1.234321234321234e6L, "1.23432e+06" }, + { 1.234321234321234e7L, "1.23432e+07" }, + { 1.234321234321234e8L, "1.23432e+08" }, + { 1.234321234321234e9L, "1.23432e+09" }, + { 1.234321234321234e10L, "1.23432e+10" }, + { 1.234321234321234e11L, "1.23432e+11" }, + { 1.234321234321234e12L, "1.23432e+12" }, + { 1.234321234321234e13L, "1.23432e+13" }, + { 1.234321234321234e14L, "1.23432e+14" }, + { 1.234321234321234e15L, "1.23432e+15" }, + { 1.234321234321234e16L, "1.23432e+16" }, + { 1.234321234321234e17L, "1.23432e+17" }, + { 1.234321234321234e18L, "1.23432e+18" }, + { 1.234321234321234e19L, "1.23432e+19" }, + { 1.234321234321234e20L, "1.23432e+20" }, + { 1.234321234321234e21L, "1.23432e+21" }, + { 1.234321234321234e22L, "1.23432e+22" }, + { 1.234321234321234e23L, "1.23432e+23" }, + { 1.234321234321234e24L, "1.23432e+24" }, + { 1.234321234321234e25L, "1.23432e+25" }, + { 1.234321234321234e26L, "1.23432e+26" }, + { 1.234321234321234e27L, "1.23432e+27" }, + { 1.234321234321234e28L, "1.23432e+28" }, + { 1.234321234321234e29L, "1.23432e+29" }, + { 1.234321234321234e30L, "1.23432e+30" }, + { 1.234321234321234e31L, "1.23432e+31" }, + { 1.234321234321234e32L, "1.23432e+32" }, + { 1.234321234321234e33L, "1.23432e+33" }, + { 1.234321234321234e34L, "1.23432e+34" }, + { 1.234321234321234e35L, "1.23432e+35" }, + { 1.234321234321234e36L, "1.23432e+36" } }; size_t k; for (k = 0; k < SIZEOF (data); k++) { - char *result; - int retval = - my_asprintf (&result, "%Lg", data[k].value); - ASSERT (result != NULL); - ASSERT (strcmp (result, data[k].string) == 0); - ASSERT (retval == strlen (result)); - free (result); + char *result; + int retval = + my_asprintf (&result, "%Lg", data[k].value); + const char *expected = data[k].string; + ASSERT (result != NULL); + ASSERT (strcmp (result, expected) == 0 + /* Some implementations produce exponents with 3 digits. */ + || (expected[strlen (expected) - 4] == 'e' + && strlen (result) == strlen (expected) + 1 + && memcmp (result, expected, strlen (expected) - 2) == 0 + && result[strlen (expected) - 2] == '0' + && strcmp (result + strlen (expected) - 1, + expected + strlen (expected) - 2) + == 0)); + ASSERT (retval == strlen (result)); + free (result); } } @@ -2939,7 +3091,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative zero. */ char *result; int retval = - my_asprintf (&result, "%Lg %d", -0.0L, 33, 44, 55); + my_asprintf (&result, "%Lg %d", minus_zerol, 33, 44, 55); ASSERT (result != NULL); if (have_minus_zero ()) ASSERT (strcmp (result, "-0 33") == 0); @@ -2950,10 +3102,10 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Positive infinity. */ char *result; int retval = - my_asprintf (&result, "%Lg %d", 1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%Lg %d", Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "inf 33") == 0 - || strcmp (result, "infinity 33") == 0); + || strcmp (result, "infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -2961,27 +3113,26 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* Negative infinity. */ char *result; int retval = - my_asprintf (&result, "%Lg %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%Lg %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, "-inf 33") == 0 - || strcmp (result, "-infinity 33") == 0); + || strcmp (result, "-infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%Lg %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%Lg %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } -#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) +#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE { /* Quiet NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) }; @@ -2990,8 +3141,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3004,8 +3155,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3024,8 +3175,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3037,8 +3188,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3050,8 +3201,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3063,8 +3214,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3076,8 +3227,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, 0, strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3148,7 +3299,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%#.Lg %d", 9.75L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1.e+01 33") == 0); + ASSERT (strcmp (result, "1.e+01 33") == 0 + || strcmp (result, "1.e+001 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3166,23 +3318,22 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) { /* FLAG_ZERO with infinite number. */ char *result; int retval = - my_asprintf (&result, "%015Lg %d", -1.0L / 0.0L, 33, 44, 55); + my_asprintf (&result, "%015Lg %d", - Infinityl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strcmp (result, " -inf 33") == 0 - || strcmp (result, " -infinity 33") == 0); + || strcmp (result, " -infinity 33") == 0); ASSERT (retval == strlen (result)); free (result); } { /* FLAG_ZERO with NaN. */ - static long double zero = 0.0L; char *result; int retval = - my_asprintf (&result, "%050Lg %d", zero / zero, 33, 44, 55); + my_asprintf (&result, "%050Lg %d", NaNl (), 33, 44, 55); ASSERT (result != NULL); ASSERT (strlen (result) == 50 + 3 - && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); + && strisnan (result, strspn (result, " "), strlen (result) - 3, 0) + && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3192,7 +3343,28 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%.Lg %d", 1234.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, "1e+03 33") == 0); + ASSERT (strcmp (result, "1e+03 33") == 0 + || strcmp (result, "1e+003 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with no rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.5Lg %d", 999.951L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { /* Precision with rounding. */ + char *result; + int retval = + my_asprintf (&result, "%.5Lg %d", 999.996L, 33, 44, 55); + ASSERT (result != NULL); + ASSERT (strcmp (result, "1000 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -3234,6 +3406,231 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) ASSERT (retval == strlen (result)); free (result); } + + /* Test the support of the left-adjust flag. */ + + { + char *result; + int retval = + my_asprintf (&result, "a%*sc", -3, "b"); + ASSERT (result != NULL); + ASSERT (strcmp (result, "ab c") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "a%-*sc", 3, "b"); + ASSERT (result != NULL); + ASSERT (strcmp (result, "ab c") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "a%-*sc", -3, "b"); + ASSERT (result != NULL); + ASSERT (strcmp (result, "ab c") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + /* Test the support of large precision. */ + + { + char *result; + int retval = + my_asprintf (&result, "%.4000d %d", 1234567, 99); + size_t i; + ASSERT (result != NULL); + for (i = 0; i < 4000 - 7; i++) + ASSERT (result[i] == '0'); + ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.*d %d", 4000, 1234567, 99); + size_t i; + ASSERT (result != NULL); + for (i = 0; i < 4000 - 7; i++) + ASSERT (result[i] == '0'); + ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.4000d %d", -1234567, 99); + size_t i; + ASSERT (result != NULL); + ASSERT (result[0] == '-'); + for (i = 0; i < 4000 - 7; i++) + ASSERT (result[1 + i] == '0'); + ASSERT (strcmp (result + 1 + 4000 - 7, "1234567 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.4000u %d", 1234567, 99); + size_t i; + ASSERT (result != NULL); + for (i = 0; i < 4000 - 7; i++) + ASSERT (result[i] == '0'); + ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.4000o %d", 1234567, 99); + size_t i; + ASSERT (result != NULL); + for (i = 0; i < 4000 - 7; i++) + ASSERT (result[i] == '0'); + ASSERT (strcmp (result + 4000 - 7, "4553207 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.4000x %d", 1234567, 99); + size_t i; + ASSERT (result != NULL); + for (i = 0; i < 4000 - 6; i++) + ASSERT (result[i] == '0'); + ASSERT (strcmp (result + 4000 - 6, "12d687 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%#.4000x %d", 1234567, 99); + size_t i; + ASSERT (result != NULL); + ASSERT (result[0] == '0'); + ASSERT (result[1] == 'x'); + for (i = 0; i < 4000 - 6; i++) + ASSERT (result[2 + i] == '0'); + ASSERT (strcmp (result + 2 + 4000 - 6, "12d687 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.4000f %d", 1.0, 99); + size_t i; + ASSERT (result != NULL); + ASSERT (result[0] == '1'); + ASSERT (result[1] == '.'); + for (i = 0; i < 4000; i++) + ASSERT (result[2 + i] == '0'); + ASSERT (strcmp (result + 2 + 4000, " 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char *result; + int retval = + my_asprintf (&result, "%.511f %d", 1.0, 99); + size_t i; + ASSERT (result != NULL); + ASSERT (result[0] == '1'); + ASSERT (result[1] == '.'); + for (i = 0; i < 511; i++) + ASSERT (result[2 + i] == '0'); + ASSERT (strcmp (result + 2 + 511, " 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + { + char input[5000]; + char *result; + int retval; + size_t i; + + for (i = 0; i < sizeof (input) - 1; i++) + input[i] = 'a' + ((1000000 / (i + 1)) % 26); + input[i] = '\0'; + retval = my_asprintf (&result, "%.4000s %d", input, 99); + ASSERT (result != NULL); + ASSERT (memcmp (result, input, 4000) == 0); + ASSERT (strcmp (result + 4000, " 99") == 0); + ASSERT (retval == strlen (result)); + free (result); + } + + /* Test the support of the %s format directive. */ + + /* To verify that these tests succeed, it is necessary to run them under + a tool that checks against invalid memory accesses, such as ElectricFence + or "valgrind --tool=memcheck". */ + { + size_t i; + + for (i = 1; i <= 8; i++) + { + char *block; + char *result; + int retval; + + block = (char *) malloc (i); + memcpy (block, "abcdefgh", i); + retval = my_asprintf (&result, "%.*s", (int) i, block); + ASSERT (result != NULL); + ASSERT (memcmp (result, block, i) == 0); + ASSERT (result[i] == '\0'); + ASSERT (retval == strlen (result)); + free (result); + free (block); + } + } +#if HAVE_WCHAR_T + { + size_t i; + + for (i = 1; i <= 8; i++) + { + wchar_t *block; + size_t j; + char *result; + int retval; + + block = (wchar_t *) malloc (i * sizeof (wchar_t)); + for (j = 0; j < i; j++) + block[j] = "abcdefgh"[j]; + retval = my_asprintf (&result, "%.*ls", (int) i, block); + ASSERT (result != NULL); + ASSERT (memcmp (result, "abcdefgh", i) == 0); + ASSERT (result[i] == '\0'); + ASSERT (retval == strlen (result)); + free (result); + free (block); + } + } +#endif } static int