X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vasnprintf-posix.c;h=c2715ea130498ba74c3ec34fd14a82cd3721c52d;hb=5bf73fbe89c75118e5e9a53e4b88a57729d26964;hp=4605cd1d9934f6b50e010b9fd5351af65a3be7a4;hpb=0a56509612c0b43a3f05361ecfb73b8b39f8e66c;p=gnulib.git

diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c
index 4605cd1d9..c2715ea13 100644
--- a/tests/test-vasnprintf-posix.c
+++ b/tests/test-vasnprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 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
@@ -20,34 +20,25 @@
 
 #include "vasnprintf.h"
 
+#include <errno.h>
 #include <float.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "macros.h"
+#include "minus-zero.h"
+#include "infinity.h"
 #include "nan.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 SGI MIPS floating-point format does not distinguish 0.0 and -0.0.  */
 static int
 have_minus_zero ()
 {
   static double plus_zero = 0.0;
-  static double minus_zero = -0.0;
+  double minus_zero = minus_zerod;
   return memcmp (&plus_zero, &minus_zero, sizeof (double)) != 0;
 }
 
@@ -83,15 +74,15 @@ 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;
 }
@@ -126,10 +117,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       ASSERT (strcmp (result, "12345") == 0);
       ASSERT (length == 5);
       if (size < 6)
-	ASSERT (result != buf);
+        ASSERT (result != buf);
       ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
       if (result != buf)
-	free (result);
+        free (result);
     }
 
   /* Test support of size specifiers as in C99.  */
@@ -183,9 +174,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -196,9 +187,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -216,7 +207,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%a %d", -0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%a %d", minus_zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0x0p+0 33") == 0);
@@ -227,7 +218,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%a %d", 1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%a %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -237,7 +228,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%a %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%a %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -250,8 +241,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -262,9 +253,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -275,9 +266,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -288,9 +279,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -301,9 +292,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -314,9 +305,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -327,9 +318,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -341,9 +332,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -354,9 +345,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -367,9 +358,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -380,9 +371,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -393,9 +384,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%-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 (length == strlen (result));
     free (result);
   }
@@ -406,9 +397,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%+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 (length == strlen (result));
     free (result);
   }
@@ -419,9 +410,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "% 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 (length == strlen (result));
     free (result);
   }
@@ -432,9 +423,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#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 (length == strlen (result));
     free (result);
   }
@@ -445,9 +436,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#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 (length == strlen (result));
     free (result);
   }
@@ -458,9 +449,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -468,7 +459,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%010a %d", 1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%010a %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     /* "0000000inf 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
@@ -485,8 +476,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     /* "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 (length == strlen (result));
     free (result);
   }
@@ -497,9 +488,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -510,9 +501,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -530,7 +521,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%La %d", -0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%La %d", minus_zerol, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0x0p+0 33") == 0);
@@ -541,7 +532,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%La %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%La %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -551,7 +542,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%La %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%La %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0);
     ASSERT (length == strlen (result));
@@ -564,12 +555,12 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -578,8 +569,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -592,8 +583,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -612,8 +603,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -625,8 +616,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -638,8 +629,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -651,8 +642,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -664,8 +655,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -677,9 +668,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -690,9 +681,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -703,9 +694,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -716,9 +707,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -729,9 +720,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -742,9 +733,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -757,9 +748,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -770,9 +761,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -783,9 +774,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -796,9 +787,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -809,9 +800,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%-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 (length == strlen (result));
     free (result);
   }
@@ -822,9 +813,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%+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 (length == strlen (result));
     free (result);
   }
@@ -835,9 +826,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "% 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 (length == strlen (result));
     free (result);
   }
@@ -848,9 +839,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#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 (length == strlen (result));
     free (result);
   }
@@ -861,9 +852,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#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 (length == strlen (result));
     free (result);
   }
@@ -874,9 +865,9 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -884,7 +875,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%010La %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%010La %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     /* "0000000inf 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
@@ -901,8 +892,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     /* "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 (length == strlen (result));
     free (result);
   }
@@ -932,91 +923,91 @@ test_function (char * (*my_asnprintf) (char *, size_t *, 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++)
       {
-	size_t length;
-	char *result =
-	  my_asnprintf (NULL, &length, "%f", data[k].value);
-	ASSERT (result != NULL);
-	ASSERT (strmatch (data[k].string, result));
-	ASSERT (length == strlen (result));
-	free (result);
+        size_t length;
+        char *result =
+          my_asnprintf (NULL, &length, "%f", data[k].value);
+        ASSERT (result != NULL);
+        ASSERT (strmatch (data[k].string, result));
+        ASSERT (length == strlen (result));
+        free (result);
       }
   }
 
@@ -1043,7 +1034,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%f %d", -0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%f %d", minus_zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1054,10 +1045,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%f %d", 1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%f %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
-	    || strcmp (result, "infinity 33") == 0);
+            || strcmp (result, "infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1065,10 +1056,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%f %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%f %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
-	    || strcmp (result, "-infinity 33") == 0);
+            || strcmp (result, "-infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1079,8 +1070,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1158,10 +1149,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015f %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015f %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
-	    || strcmp (result, "      -infinity 33") == 0);
+            || strcmp (result, "      -infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1172,8 +1163,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1188,6 +1179,26 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     free (result);
   }
 
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2f %d", 999.951, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "999.95 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2f %d", 999.996, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1000.00 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
   { /* A positive number.  */
     size_t length;
     char *result =
@@ -1211,91 +1222,91 @@ test_function (char * (*my_asnprintf) (char *, size_t *, 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++)
       {
-	size_t length;
-	char *result =
-	  my_asnprintf (NULL, &length, "%Lf", data[k].value);
-	ASSERT (result != NULL);
-	ASSERT (strmatch (data[k].string, result));
-	ASSERT (length == strlen (result));
-	free (result);
+        size_t length;
+        char *result =
+          my_asnprintf (NULL, &length, "%Lf", data[k].value);
+        ASSERT (result != NULL);
+        ASSERT (strmatch (data[k].string, result));
+        ASSERT (length == strlen (result));
+        free (result);
       }
   }
 
@@ -1322,7 +1333,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lf %d", -0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lf %d", minus_zerol, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1333,10 +1344,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lf %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lf %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
-	    || strcmp (result, "infinity 33") == 0);
+            || strcmp (result, "infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1344,10 +1355,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lf %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lf %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
-	    || strcmp (result, "-infinity 33") == 0);
+            || strcmp (result, "-infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1358,12 +1369,12 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -1372,8 +1383,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1386,8 +1397,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1406,8 +1417,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1419,8 +1430,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1432,8 +1443,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1445,8 +1456,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1458,8 +1469,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1538,10 +1549,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015Lf %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015Lf %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
-	    || strcmp (result, "      -infinity 33") == 0);
+            || strcmp (result, "      -infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1552,8 +1563,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1568,6 +1579,26 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     free (result);
   }
 
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2Lf %d", 999.951L, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "999.95 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2Lf %d", 999.996L, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1000.00 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
   /* Test the support of the %F format directive.  */
 
   { /* A positive number.  */
@@ -1613,7 +1644,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%F %d", -0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%F %d", minus_zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1624,10 +1655,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%F %d", 1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%F %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "INF 33") == 0
-	    || strcmp (result, "INFINITY 33") == 0);
+            || strcmp (result, "INFINITY 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1635,10 +1666,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%F %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%F %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-INF 33") == 0
-	    || strcmp (result, "-INFINITY 33") == 0);
+            || strcmp (result, "-INFINITY 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1649,8 +1680,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1668,10 +1699,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015F %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015F %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -INF 33") == 0
-	    || strcmp (result, "      -INFINITY 33") == 0);
+            || strcmp (result, "      -INFINITY 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1686,6 +1717,26 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     free (result);
   }
 
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2F %d", 999.951, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "999.95 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2F %d", 999.996, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1000.00 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
   { /* A positive number.  */
     size_t length;
     char *result =
@@ -1729,7 +1780,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%LF %d", -0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%LF %d", minus_zerol, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000 33") == 0);
@@ -1740,10 +1791,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%LF %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%LF %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "INF 33") == 0
-	    || strcmp (result, "INFINITY 33") == 0);
+            || strcmp (result, "INFINITY 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1751,10 +1802,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%LF %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%LF %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-INF 33") == 0
-	    || strcmp (result, "-INFINITY 33") == 0);
+            || strcmp (result, "-INFINITY 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1765,8 +1816,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1784,10 +1835,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015LF %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015LF %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -INF 33") == 0
-	    || strcmp (result, "      -INFINITY 33") == 0);
+            || strcmp (result, "      -INFINITY 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1802,6 +1853,26 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     free (result);
   }
 
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2LF %d", 999.951L, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "999.95 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.2LF %d", 999.996L, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1000.00 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
   /* Test the support of the %e format directive.  */
 
   { /* A positive number.  */
@@ -1810,7 +1881,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1821,7 +1892,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1829,99 +1900,99 @@ test_function (char * (*my_asnprintf) (char *, size_t *, 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++)
       {
-	size_t length;
-	char *result =
-	  my_asnprintf (NULL, &length, "%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 (length == strlen (result));
-	free (result);
+        size_t length;
+        char *result =
+          my_asnprintf (NULL, &length, "%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 (length == strlen (result));
+        free (result);
       }
   }
 
@@ -1931,7 +2002,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1942,7 +2013,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1950,11 +2021,11 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%e %d", -0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%e %d", minus_zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0.000000e+00 33") == 0
-	      || strcmp (result, "-0.000000e+000 33") == 0);
+              || strcmp (result, "-0.000000e+000 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1962,10 +2033,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%e %d", 1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%e %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
-	    || strcmp (result, "infinity 33") == 0);
+            || strcmp (result, "infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1973,10 +2044,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%e %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%e %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
-	    || strcmp (result, "-infinity 33") == 0);
+            || strcmp (result, "-infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -1987,8 +2058,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -1999,7 +2070,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2010,7 +2081,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%-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 (length == strlen (result));
     free (result);
   }
@@ -2021,7 +2092,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%+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 (length == strlen (result));
     free (result);
   }
@@ -2032,7 +2103,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "% 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 (length == strlen (result));
     free (result);
   }
@@ -2043,7 +2114,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#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 (length == strlen (result));
     free (result);
   }
@@ -2054,7 +2125,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#.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 (length == strlen (result));
     free (result);
   }
@@ -2065,7 +2136,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#.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 (length == strlen (result));
     free (result);
   }
@@ -2076,7 +2147,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2084,10 +2155,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015e %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015e %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
-	    || strcmp (result, "      -infinity 33") == 0);
+            || strcmp (result, "      -infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2098,8 +2169,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2110,7 +2181,29 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -2120,7 +2213,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2130,7 +2224,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2138,91 +2233,99 @@ test_function (char * (*my_asnprintf) (char *, size_t *, 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++)
       {
-	size_t length;
-	char *result =
-	  my_asnprintf (NULL, &length, "%Le", data[k].value);
-	ASSERT (result != NULL);
-	ASSERT (strcmp (result, data[k].string) == 0);
-	ASSERT (length == strlen (result));
-	free (result);
+        size_t length;
+        char *result =
+          my_asnprintf (NULL, &length, "%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 (length == strlen (result));
+        free (result);
       }
   }
 
@@ -2231,7 +2334,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2241,7 +2345,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2249,10 +2354,11 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Le %d", -0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2260,10 +2366,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Le %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Le %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
-	    || strcmp (result, "infinity 33") == 0);
+            || strcmp (result, "infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2271,10 +2377,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Le %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Le %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
-	    || strcmp (result, "-infinity 33") == 0);
+            || strcmp (result, "-infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2285,12 +2391,12 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -2299,8 +2405,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2313,8 +2419,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2333,8 +2439,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2346,8 +2452,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2359,8 +2465,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2372,8 +2478,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2385,8 +2491,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2397,7 +2503,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2407,7 +2514,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%-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 (length == strlen (result));
     free (result);
   }
@@ -2417,7 +2525,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%+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 (length == strlen (result));
     free (result);
   }
@@ -2427,7 +2536,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "% 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 (length == strlen (result));
     free (result);
   }
@@ -2437,7 +2547,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%#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 (length == strlen (result));
     free (result);
   }
@@ -2447,7 +2558,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%#.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 (length == strlen (result));
     free (result);
   }
@@ -2457,7 +2569,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%#.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 (length == strlen (result));
     free (result);
   }
@@ -2467,7 +2580,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2475,10 +2589,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015Le %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015Le %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
-	    || strcmp (result, "      -infinity 33") == 0);
+            || strcmp (result, "      -infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2489,8 +2603,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2500,7 +2614,30 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
     free (result);
   }
@@ -2523,7 +2660,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2531,100 +2668,100 @@ test_function (char * (*my_asnprintf) (char *, size_t *, 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++)
       {
-	size_t length;
-	char *result =
-	  my_asnprintf (NULL, &length, "%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 (length == strlen (result));
-	free (result);
+        size_t length;
+        char *result =
+          my_asnprintf (NULL, &length, "%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 (length == strlen (result));
+        free (result);
       }
   }
 
@@ -2651,7 +2788,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%g %d", -0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%g %d", minus_zerod, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0 33") == 0);
@@ -2662,10 +2799,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%g %d", 1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%g %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
-	    || strcmp (result, "infinity 33") == 0);
+            || strcmp (result, "infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2673,10 +2810,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%g %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%g %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
-	    || strcmp (result, "-infinity 33") == 0);
+            || strcmp (result, "-infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2687,8 +2824,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2759,7 +2896,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%#.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 (length == strlen (result));
     free (result);
   }
@@ -2777,10 +2914,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015g %d", -1.0 / 0.0, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015g %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
-	    || strcmp (result, "      -infinity 33") == 0);
+            || strcmp (result, "      -infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2791,8 +2928,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2803,7 +2940,27 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.5g %d", 999.951, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "999.95 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.5g %d", 999.996, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1000 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2823,7 +2980,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -2831,91 +2989,100 @@ test_function (char * (*my_asnprintf) (char *, size_t *, 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++)
       {
-	size_t length;
-	char *result =
-	  my_asnprintf (NULL, &length, "%Lg", data[k].value);
-	ASSERT (result != NULL);
-	ASSERT (strcmp (result, data[k].string) == 0);
-	ASSERT (length == strlen (result));
-	free (result);
+        size_t length;
+        char *result =
+          my_asnprintf (NULL, &length, "%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 (length == strlen (result));
+        free (result);
       }
   }
 
@@ -2942,7 +3109,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative zero.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lg %d", -0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lg %d", minus_zerol, 33, 44, 55);
     ASSERT (result != NULL);
     if (have_minus_zero ())
       ASSERT (strcmp (result, "-0 33") == 0);
@@ -2953,10 +3120,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Positive infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lg %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lg %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
-	    || strcmp (result, "infinity 33") == 0);
+            || strcmp (result, "infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2964,10 +3131,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* Negative infinity.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%Lg %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%Lg %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
-	    || strcmp (result, "-infinity 33") == 0);
+            || strcmp (result, "-infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -2978,12 +3145,12 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -2992,8 +3159,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3006,8 +3173,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3026,8 +3193,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3039,8 +3206,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3052,8 +3219,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3065,8 +3232,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3078,8 +3245,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3150,7 +3317,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%#.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 (length == strlen (result));
     free (result);
   }
@@ -3168,10 +3336,10 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     size_t length;
     char *result =
-      my_asnprintf (NULL, &length, "%015Lg %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asnprintf (NULL, &length, "%015Lg %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
-	    || strcmp (result, "      -infinity 33") == 0);
+            || strcmp (result, "      -infinity 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -3182,8 +3350,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       my_asnprintf (NULL, &length, "%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 (length == strlen (result));
     free (result);
   }
@@ -3193,7 +3361,28 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     char *result =
       my_asnprintf (NULL, &length, "%.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 (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with no rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.5Lg %d", 999.951L, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "999.95 33") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  { /* Precision with rounding.  */
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.5Lg %d", 999.996L, 33, 44, 55);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1000 33") == 0);
     ASSERT (length == strlen (result));
     free (result);
   }
@@ -3286,6 +3475,19 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   {
     size_t length;
     char *result =
+      my_asnprintf (NULL, &length, "%.*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 (length == strlen (result));
+    free (result);
+  }
+
+  {
+    size_t length;
+    char *result =
       my_asnprintf (NULL, &length, "%.4000d %d", -1234567, 99);
     size_t i;
     ASSERT (result != NULL);
@@ -3352,6 +3554,36 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   }
 
   {
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.4000f %d", 1.0, 99);
+    size_t i;
+    ASSERT (result != NULL);
+    ASSERT (result[0] == '1');
+    ASSERT (result[1] == '.');
+    for (i = 0; i < 4000; i++)
+      ASSERT (result[2 + i] == '0');
+    ASSERT (strcmp (result + 2 + 4000, " 99") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  {
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%.511f %d", 1.0, 99);
+    size_t i;
+    ASSERT (result != NULL);
+    ASSERT (result[0] == '1');
+    ASSERT (result[1] == '.');
+    for (i = 0; i < 511; i++)
+      ASSERT (result[2 + i] == '0');
+    ASSERT (strcmp (result + 2 + 511, " 99") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+
+  {
     char input[5000];
     size_t length;
     char *result;
@@ -3367,6 +3599,109 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     ASSERT (length == 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;
+        size_t length;
+        char *result;
+
+        block = (char *) malloc (i);
+        memcpy (block, "abcdefgh", i);
+        result = my_asnprintf (NULL, &length, "%.*s", (int) i, block);
+        ASSERT (result != NULL);
+        ASSERT (memcmp (result, block, i) == 0);
+        ASSERT (result[i] == '\0');
+        ASSERT (length == 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;
+        size_t length;
+        char *result;
+
+        block = (wchar_t *) malloc (i * sizeof (wchar_t));
+        for (j = 0; j < i; j++)
+          block[j] = "abcdefgh"[j];
+        result = my_asnprintf (NULL, &length, "%.*ls", (int) i, block);
+        ASSERT (result != NULL);
+        ASSERT (memcmp (result, "abcdefgh", i) == 0);
+        ASSERT (result[i] == '\0');
+        ASSERT (length == strlen (result));
+        free (result);
+        free (block);
+      }
+  }
+#endif
+
+#if HAVE_WCHAR_T
+  /* Test that converting an invalid wchar_t[] to char[] fails with EILSEQ.  */
+  {
+    static const wchar_t input[] = { (wchar_t) 1702057263, 114, 0 };
+    size_t length;
+    char *result = my_asnprintf (NULL, &length, "%ls %d", input, 99);
+    if (result == NULL)
+      ASSERT (errno == EILSEQ);
+    else
+      free (result);
+  }
+  {
+    static const wchar_t input[] = { (wchar_t) 1702057263, 114, 0 };
+    size_t length;
+    char *result = my_asnprintf (NULL, &length, "%3ls %d", input, 99);
+    if (result == NULL)
+      ASSERT (errno == EILSEQ);
+    else
+      free (result);
+  }
+  {
+    static const wchar_t input[] = { (wchar_t) 1702057263, 114, 0 };
+    size_t length;
+    char *result = my_asnprintf (NULL, &length, "%.1ls %d", input, 99);
+    if (result == NULL)
+      ASSERT (errno == EILSEQ);
+    else
+      free (result);
+  }
+  {
+    static const wchar_t input[] = { (wchar_t) 1702057263, 114, 0 };
+    size_t length;
+    char *result = my_asnprintf (NULL, &length, "%3.1ls %d", input, 99);
+    if (result == NULL)
+      ASSERT (errno == EILSEQ);
+    else
+      free (result);
+  }
+#endif
+
+#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && !defined __UCLIBC__
+  /* Test that the 'I' flag is supported.  */
+  {
+    size_t length;
+    char *result =
+      my_asnprintf (NULL, &length, "%Id %d", 1234567, 99);
+    ASSERT (result != NULL);
+    ASSERT (strcmp (result, "1234567 99") == 0);
+    ASSERT (length == strlen (result));
+    free (result);
+  }
+#endif
 }
 
 static char *