X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vasprintf-posix.c;h=ef19df8d5127d764f47cc70dcb91edea06fa1f6a;hb=de4d0a383be20eb6cbeb09ecbd66a5514779b914;hp=3ebb0dc73442c27b1122d7bd144a6d59fd6a20b1;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c
index 3ebb0dc73..ef19df8d5 100644
--- a/tests/test-vasprintf-posix.c
+++ b/tests/test-vasprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasprintf() and asprintf() functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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,44 +23,42 @@
 #include <float.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#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 "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 = - 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
@@ -93,19 +91,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 *, ...))
 {
@@ -174,9 +172,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);
   }
@@ -187,9 +185,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);
   }
@@ -207,7 +205,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", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0x0p+0 33") == 0);
@@ -238,11 +236,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,9 +251,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       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);
+            || 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,9 +264,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       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);
+            || strcmp (result, "0x3p-1 33") == 0
+            || strcmp (result, "0x6p-2 33") == 0
+            || strcmp (result, "0xcp-3 33") == 0);
     ASSERT (retval == strlen (result));
     free (result);
   }
@@ -279,9 +277,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);
   }
@@ -292,9 +290,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);
   }
@@ -305,9 +303,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);
   }
@@ -318,9 +316,9 @@ 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);
   }
@@ -332,9 +330,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       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);
   }
@@ -345,9 +343,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);
   }
@@ -358,9 +356,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);
   }
@@ -371,9 +369,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);
   }
@@ -384,9 +382,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);
   }
@@ -397,9 +395,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);
   }
@@ -410,9 +408,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);
   }
@@ -423,9 +421,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);
   }
@@ -436,9 +434,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);
   }
@@ -449,9 +447,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);
   }
@@ -471,13 +469,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
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
     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);
   }
@@ -488,9 +486,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);
   }
@@ -501,9 +499,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);
   }
@@ -521,7 +519,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);
@@ -552,11 +550,11 @@ 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);
   }
@@ -569,8 +567,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);
   }
@@ -583,8 +581,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);
   }
@@ -603,8 +601,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);
   }
@@ -616,8 +614,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);
   }
@@ -629,8 +627,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);
   }
@@ -642,8 +640,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);
   }
@@ -655,8 +653,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);
   }
@@ -668,9 +666,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);
   }
@@ -681,9 +679,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);
   }
@@ -694,9 +692,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);
   }
@@ -707,9 +705,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);
   }
@@ -720,9 +718,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);
   }
@@ -733,9 +731,9 @@ 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);
   }
@@ -748,9 +746,9 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       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);
   }
@@ -761,9 +759,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);
   }
@@ -774,9 +772,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);
   }
@@ -787,9 +785,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);
   }
@@ -800,9 +798,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);
   }
@@ -813,9 +811,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);
   }
@@ -826,9 +824,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);
   }
@@ -839,9 +837,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);
   }
@@ -852,9 +850,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);
   }
@@ -865,9 +863,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);
   }
@@ -887,13 +885,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
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
     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);
   }
@@ -923,91 +921,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);
       }
   }
 
@@ -1034,7 +1032,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", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1048,7 +1046,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%f %d", 1.0 / 0.0, 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);
   }
@@ -1059,7 +1057,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%f %d", -1.0 / 0.0, 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);
   }
@@ -1067,11 +1065,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);
   }
@@ -1152,7 +1150,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015f %d", -1.0 / 0.0, 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);
   }
@@ -1160,11 +1158,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);
   }
@@ -1179,6 +1177,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 =
@@ -1202,91 +1220,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);
       }
   }
 
@@ -1313,7 +1331,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);
@@ -1327,7 +1345,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%Lf %d", 1.0L / 0.0L, 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);
   }
@@ -1338,20 +1356,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%Lf %d", -1.0L / 0.0L, 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);
   }
@@ -1364,8 +1381,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);
   }
@@ -1378,8 +1395,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);
   }
@@ -1398,8 +1415,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);
   }
@@ -1411,8 +1428,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);
   }
@@ -1424,8 +1441,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);
   }
@@ -1437,8 +1454,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);
   }
@@ -1450,8 +1467,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);
   }
@@ -1533,20 +1550,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015Lf %d", -1.0L / 0.0L, 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);
   }
@@ -1561,6 +1577,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.  */
@@ -1606,7 +1642,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", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1620,7 +1656,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%F %d", 1.0 / 0.0, 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);
   }
@@ -1631,7 +1667,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%F %d", -1.0 / 0.0, 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);
   }
@@ -1639,11 +1675,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);
   }
@@ -1664,7 +1700,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015F %d", -1.0 / 0.0, 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);
   }
@@ -1679,6 +1715,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 =
@@ -1722,7 +1778,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);
@@ -1736,7 +1792,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%LF %d", 1.0L / 0.0L, 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);
   }
@@ -1747,20 +1803,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%LF %d", -1.0L / 0.0L, 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);
   }
@@ -1781,7 +1836,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015LF %d", -1.0L / 0.0L, 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);
   }
@@ -1796,6 +1851,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.  */
@@ -1804,7 +1879,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);
   }
@@ -1815,7 +1890,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);
   }
@@ -1823,99 +1898,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);
       }
   }
 
@@ -1925,7 +2000,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);
   }
@@ -1936,7 +2011,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);
   }
@@ -1944,11 +2019,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", -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);
   }
@@ -1959,7 +2034,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%e %d", 1.0 / 0.0, 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);
   }
@@ -1970,7 +2045,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%e %d", -1.0 / 0.0, 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);
   }
@@ -1978,11 +2053,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);
   }
@@ -1993,7 +2068,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);
   }
@@ -2004,7 +2079,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);
   }
@@ -2015,7 +2090,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);
   }
@@ -2026,7 +2101,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);
   }
@@ -2037,7 +2112,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);
   }
@@ -2048,7 +2123,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);
   }
@@ -2059,7 +2134,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);
   }
@@ -2070,7 +2145,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);
   }
@@ -2081,7 +2156,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015e %d", -1.0 / 0.0, 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);
   }
@@ -2089,11 +2164,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);
   }
@@ -2104,7 +2179,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);
   }
@@ -2114,7 +2211,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);
   }
@@ -2124,7 +2222,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);
   }
@@ -2132,91 +2231,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);
       }
   }
 
@@ -2225,7 +2332,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);
   }
@@ -2235,7 +2343,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);
   }
@@ -2243,10 +2352,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);
   }
@@ -2257,7 +2367,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%Le %d", 1.0L / 0.0L, 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);
   }
@@ -2268,20 +2378,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%Le %d", -1.0L / 0.0L, 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);
   }
@@ -2294,8 +2403,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);
   }
@@ -2308,8 +2417,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);
   }
@@ -2328,8 +2437,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);
   }
@@ -2341,8 +2450,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);
   }
@@ -2354,8 +2463,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);
   }
@@ -2367,8 +2476,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);
   }
@@ -2380,8 +2489,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);
   }
@@ -2392,7 +2501,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);
   }
@@ -2402,7 +2512,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);
   }
@@ -2412,7 +2523,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);
   }
@@ -2422,7 +2534,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);
   }
@@ -2432,7 +2545,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);
   }
@@ -2442,7 +2556,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);
   }
@@ -2452,7 +2567,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);
   }
@@ -2462,7 +2578,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);
   }
@@ -2473,20 +2590,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015Le %d", -1.0L / 0.0L, 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);
   }
@@ -2496,7 +2612,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);
   }
@@ -2519,7 +2658,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);
   }
@@ -2527,100 +2666,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);
       }
   }
 
@@ -2647,7 +2786,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", -zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0 33") == 0);
@@ -2661,7 +2800,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%g %d", 1.0 / 0.0, 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);
   }
@@ -2672,7 +2811,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%g %d", -1.0 / 0.0, 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);
   }
@@ -2680,11 +2819,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);
   }
@@ -2755,7 +2894,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);
   }
@@ -2776,7 +2915,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015g %d", -1.0 / 0.0, 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);
   }
@@ -2784,11 +2923,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);
   }
@@ -2799,7 +2938,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);
   }
@@ -2819,7 +2978,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);
   }
@@ -2827,91 +2987,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);
       }
   }
 
@@ -2938,7 +3107,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);
@@ -2952,7 +3121,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%Lg %d", 1.0L / 0.0L, 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);
   }
@@ -2963,20 +3132,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%Lg %d", -1.0L / 0.0L, 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);
   }
@@ -2989,8 +3157,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);
   }
@@ -3003,8 +3171,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);
   }
@@ -3023,8 +3191,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);
   }
@@ -3036,8 +3204,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);
   }
@@ -3049,8 +3217,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);
   }
@@ -3062,8 +3230,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);
   }
@@ -3075,8 +3243,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);
   }
@@ -3147,7 +3315,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);
   }
@@ -3168,20 +3337,19 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
       my_asprintf (&result, "%015Lg %d", -1.0L / 0.0L, 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);
   }
@@ -3191,7 +3359,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);
   }
@@ -3233,6 +3422,201 @@ 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 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