X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-snprintf-posix.h;h=262cdda558ec96e06b3c0f8567061125648f13ac;hb=2b08e890726e2c572d2ba64f19bece957d1bfd98;hp=570f8b77da3934c756c5c753f765eddc47d13a3c;hpb=0a56509612c0b43a3f05361ecfb73b8b39f8e66c;p=gnulib.git diff --git a/tests/test-snprintf-posix.h b/tests/test-snprintf-posix.h index 570f8b77d..262cdda55 100644 --- a/tests/test-snprintf-posix.h +++ b/tests/test-snprintf-posix.h @@ -1,5 +1,5 @@ /* Test of POSIX compatible vsnprintf() and snprintf() functions. - Copyright (C) 2007-2008 Free Software Foundation, Inc. + Copyright (C) 2007-2009 Free Software Foundation, Inc. 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 @@ -23,10 +23,30 @@ static int have_minus_zero () { static double plus_zero = 0.0; - static double minus_zero = -0.0; + double minus_zero = - plus_zero; return memcmp (&plus_zero, &minus_zero, sizeof (double)) != 0; } +/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0. + So we use -zerod instead. */ +double zerod = 0.0; + +/* On HP-UX 10.20, negating 0.0L does not yield -0.0L. + So we use minus_zerol instead. + IRIX cc can't put -0.0L into .data, but can compute at runtime. + Note that the expression -LDBL_MIN * LDBL_MIN does not work on other + platforms, such as when cross-compiling to PowerPC on MacOS X 10.5. */ +#if defined __hpux || defined __sgi +static long double +compute_minus_zerol (void) +{ + return -LDBL_MIN * LDBL_MIN; +} +# define minus_zerol compute_minus_zerol () +#else +long double minus_zerol = -0.0L; +#endif + /* Representation of an 80-bit 'long double' as an initializer for a sequence of 'unsigned int' words. */ #ifdef WORDS_BIGENDIAN @@ -172,7 +192,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%a %d", -0.0, 33, 44, 55); + my_snprintf (result, sizeof (result), "%a %d", -zerod, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0x0p+0 33") == 0); ASSERT (retval == strlen (result)); @@ -436,7 +456,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%La %d", -0.0L, 33, 44, 55); + my_snprintf (result, sizeof (result), "%La %d", minus_zerol, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0x0p+0 33") == 0); ASSERT (retval == strlen (result)); @@ -881,7 +901,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%f %d", -0.0, 33, 44, 55); + my_snprintf (result, sizeof (result), "%f %d", -zerod, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); ASSERT (retval == strlen (result)); @@ -919,7 +939,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%10f %d", 1.75, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, " 1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -928,7 +947,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%-10f %d", 1.75, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -937,7 +955,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%+f %d", 1.75, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "+1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -946,7 +963,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "% f %d", 1.75, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, " 1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -955,7 +971,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#f %d", 1.75, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -964,7 +979,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#.f %d", 1.75, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "2. 33") == 0); ASSERT (retval == strlen (result)); } @@ -1004,6 +1018,22 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (retval == strlen (result)); } + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2f %d", 999.951, 33, 44, 55); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2f %d", 999.996, 33, 44, 55); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + } + { /* A positive number. */ char result[100]; int retval = @@ -1128,7 +1158,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%Lf %d", -0.0L, 33, 44, 55); + my_snprintf (result, sizeof (result), "%Lf %d", minus_zerol, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); ASSERT (retval == strlen (result)); @@ -1253,7 +1283,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%10Lf %d", 1.75L, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, " 1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -1262,7 +1291,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%-10Lf %d", 1.75L, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -1271,7 +1299,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%+Lf %d", 1.75L, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "+1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -1280,7 +1307,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "% Lf %d", 1.75L, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, " 1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -1289,7 +1315,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#Lf %d", 1.75L, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "1.750000 33") == 0); ASSERT (retval == strlen (result)); } @@ -1298,7 +1323,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#.Lf %d", 1.75L, 33, 44, 55); - ASSERT (result != NULL); ASSERT (strcmp (result, "2. 33") == 0); ASSERT (retval == strlen (result)); } @@ -1338,6 +1362,22 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (retval == strlen (result)); } + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2Lf %d", 999.951L, 33, 44, 55); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2Lf %d", 999.996L, 33, 44, 55); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + } + /* Test the support of the %F format directive. */ { /* A positive number. */ @@ -1375,7 +1415,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%F %d", -0.0, 33, 44, 55); + my_snprintf (result, sizeof (result), "%F %d", -zerod, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); ASSERT (retval == strlen (result)); @@ -1434,6 +1474,22 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (retval == strlen (result)); } + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2F %d", 999.951, 33, 44, 55); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2F %d", 999.996, 33, 44, 55); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + } + { /* A positive number. */ char result[100]; int retval = @@ -1469,7 +1525,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%LF %d", -0.0L, 33, 44, 55); + my_snprintf (result, sizeof (result), "%LF %d", minus_zerol, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000 33") == 0); ASSERT (retval == strlen (result)); @@ -1528,6 +1584,22 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (retval == strlen (result)); } + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2LF %d", 999.951L, 33, 44, 55); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.2LF %d", 999.996L, 33, 44, 55); + ASSERT (strcmp (result, "1000.00 33") == 0); + ASSERT (retval == strlen (result)); + } + /* Test the support of the %e format directive. */ { /* A positive number. */ @@ -1633,7 +1705,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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 @@ -1667,7 +1738,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%e %d", -0.0, 33, 44, 55); + my_snprintf (result, sizeof (result), "%e %d", -zerod, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0.000000e+00 33") == 0 || strcmp (result, "-0.000000e+000 33") == 0); @@ -1802,11 +1873,30 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (retval == strlen (result)); } + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.4e %d", 999.951, 33, 44, 55); + ASSERT (strcmp (result, "9.9995e+02 33") == 0 + || strcmp (result, "9.9995e+002 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.4e %d", 999.996, 33, 44, 55); + ASSERT (strcmp (result, "1.0000e+03 33") == 0 + || strcmp (result, "1.0000e+003 33") == 0); + ASSERT (retval == strlen (result)); + } + { /* A positive number. */ char result[100]; int retval = my_snprintf (result, sizeof (result), "%Le %d", 12.75L, 33, 44, 55); - 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)); } @@ -1814,7 +1904,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%Le %d", 1234567.0L, 33, 44, 55); - 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)); } @@ -1902,7 +1993,15 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%Le", data[k].value); - ASSERT (strcmp (result, data[k].string) == 0); + const char *expected = data[k].string; + 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)); } } @@ -1911,7 +2010,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%Le %d", -0.03125L, 33, 44, 55); - 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)); } @@ -1919,16 +2019,18 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%Le %d", 0.0L, 33, 44, 55); - 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)); } { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%Le %d", -0.0L, 33, 44, 55); + my_snprintf (result, sizeof (result), "%Le %d", minus_zerol, 33, 44, 55); 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)); } @@ -2051,7 +2153,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%15Le %d", 1.75L, 33, 44, 55); - 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)); } @@ -2059,7 +2162,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%-15Le %d", 1.75L, 33, 44, 55); - 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)); } @@ -2067,7 +2171,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%+Le %d", 1.75L, 33, 44, 55); - 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)); } @@ -2075,7 +2180,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "% Le %d", 1.75L, 33, 44, 55); - 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)); } @@ -2083,7 +2189,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#Le %d", 1.75L, 33, 44, 55); - 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)); } @@ -2091,7 +2198,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#.Le %d", 1.75L, 33, 44, 55); - 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)); } @@ -2099,7 +2207,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#.Le %d", 9.75L, 33, 44, 55); - 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)); } @@ -2107,7 +2216,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%015Le %d", 1234.0L, 33, 44, 55); - 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)); } @@ -2134,7 +2244,26 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%.Le %d", 1234.0L, 33, 44, 55); - ASSERT (strcmp (result, "1e+03 33") == 0); + ASSERT (strcmp (result, "1e+03 33") == 0 + || strcmp (result, "1e+003 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.4Le %d", 999.951L, 33, 44, 55); + ASSERT (strcmp (result, "9.9995e+02 33") == 0 + || strcmp (result, "9.9995e+002 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.4Le %d", 999.996L, 33, 44, 55); + ASSERT (strcmp (result, "1.0000e+03 33") == 0 + || strcmp (result, "1.0000e+003 33") == 0); ASSERT (retval == strlen (result)); } @@ -2274,7 +2403,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%g %d", -0.0, 33, 44, 55); + my_snprintf (result, sizeof (result), "%g %d", -zerod, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0 33") == 0); ASSERT (retval == strlen (result)); @@ -2401,6 +2530,22 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (retval == strlen (result)); } + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.5g %d", 999.951, 33, 44, 55); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.5g %d", 999.996, 33, 44, 55); + ASSERT (strcmp (result, "1000 33") == 0); + ASSERT (retval == strlen (result)); + } + { /* A positive number. */ char result[100]; int retval = @@ -2413,7 +2558,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%Lg %d", 1234567.0L, 33, 44, 55); - 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)); } @@ -2501,7 +2647,16 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%Lg", data[k].value); - ASSERT (strcmp (result, data[k].string) == 0); + const char *expected = data[k].string; + 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)); } } @@ -2525,7 +2680,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) { /* Negative zero. */ char result[100]; int retval = - my_snprintf (result, sizeof (result), "%Lg %d", -0.0L, 33, 44, 55); + my_snprintf (result, sizeof (result), "%Lg %d", minus_zerol, 33, 44, 55); if (have_minus_zero ()) ASSERT (strcmp (result, "-0 33") == 0); ASSERT (retval == strlen (result)); @@ -2698,7 +2853,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%#.Lg %d", 9.75L, 33, 44, 55); - 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)); } @@ -2733,7 +2889,24 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%.Lg %d", 1234.0L, 33, 44, 55); - ASSERT (strcmp (result, "1e+03 33") == 0); + ASSERT (strcmp (result, "1e+03 33") == 0 + || strcmp (result, "1e+003 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with no rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.5Lg %d", 999.951L, 33, 44, 55); + ASSERT (strcmp (result, "999.95 33") == 0); + ASSERT (retval == strlen (result)); + } + + { /* Precision with rounding. */ + char result[100]; + int retval = + my_snprintf (result, sizeof (result), "%.5Lg %d", 999.996L, 33, 44, 55); + ASSERT (strcmp (result, "1000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2802,7 +2975,17 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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)); + } + + { + char result[5000]; + int retval = + my_snprintf (result, sizeof (result), "%.*d %d", 4000, 1234567, 99); + size_t i; for (i = 0; i < 4000 - 7; i++) ASSERT (result[i] == '0'); ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0); @@ -2814,7 +2997,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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'); @@ -2827,7 +3009,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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); @@ -2839,7 +3020,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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); @@ -2851,7 +3031,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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); @@ -2863,7 +3042,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) int retval = my_snprintf (result, sizeof (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++) @@ -2882,9 +3060,54 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) input[i] = 'a' + ((1000000 / (i + 1)) % 26); input[i] = '\0'; retval = my_snprintf (result, sizeof (result), "%.4000s %d", input, 99); - ASSERT (result != NULL); ASSERT (memcmp (result, input, 4000) == 0); ASSERT (strcmp (result + 4000, " 99") == 0); ASSERT (retval == strlen (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[5000]; + int retval; + + block = (char *) malloc (i); + memcpy (block, "abcdefgh", i); + retval = my_snprintf (result, sizeof (result), "%.*s", (int) i, block); + ASSERT (memcmp (result, block, i) == 0); + ASSERT (result[i] == '\0'); + ASSERT (retval == strlen (result)); + free (block); + } + } +#if HAVE_WCHAR_T + { + size_t i; + + for (i = 1; i <= 8; i++) + { + wchar_t *block; + size_t j; + char result[5000]; + int retval; + + block = (wchar_t *) malloc (i * sizeof (wchar_t)); + for (j = 0; j < i; j++) + block[j] = "abcdefgh"[j]; + retval = my_snprintf (result, sizeof (result), "%.*ls", (int) i, block); + ASSERT (memcmp (result, "abcdefgh", i) == 0); + ASSERT (result[i] == '\0'); + ASSERT (retval == strlen (result)); + free (block); + } + } +#endif }