* stdio-common/printf_fp.c (___printf_fp): Don't print negative sign

	for exponent 0.
	* stdio-common/tfformat.c (sprint_doubles): Add a new test.

diff --git a/ChangeLog b/ChangeLog
index 9353a0959fa9b2ae7940bbe3cfb30cf4b984ee37..7c98365613950413eaecd75fd7873d46f242ffc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-04-30  Jakub Jelinek  <jakub@redhat.com>
 
+       * stdio-common/printf_fp.c (___printf_fp): Don't print negative sign
+       for exponent 0.
+       * stdio-common/tfformat.c (sprint_doubles): Add a new test.
+
        [BZ #4439]
        * resolv/inet_ntop.c (inet_ntop4): Take terminating '\0' into
        account in the size check.

diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 9b796eac2f4ce6382ef9a0d61dde73d905c63809..6e5ff5855bda84f7a27f6b78e7fdc92a1508fc03 100644 (file)
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -793,7 +793,7 @@ ___printf_fp (FILE *fp,
   else
     {
       /* This is a special case.  We don't need a factor because the
-        numbers are in the range of 0.0 <= fp < 8.0.  We simply
+        numbers are in the range of 1.0 <= |fp| < 8.0.  We simply
         shift it to the right place and divide it by 1.0 to get the
         leading digit.  (Of course this division is not really made.)  */
       assert (0 <= exponent && exponent < 3 &&
@@ -1013,6 +1013,12 @@ ___printf_fp (FILE *fp,
                  {
                    *wstartp = '1';
                    exponent += expsign == 0 ? 1 : -1;
+
+                   /* The above exponent adjustment could lead to 1.0e-00,
+                      e.g. for 0.999999999.  Make sure exponent 0 always
+                      uses + sign.  */
+                   if (exponent == 0)
+                     expsign = 0;
                  }
                else if (intdig_no == dig_max)
                  {

diff --git a/stdio-common/tfformat.c b/stdio-common/tfformat.c
index 259e2e0b18043cae7079d76871473d398590abba..d67b3b504d7d6e876279379f27a2f7eb43ffa705 100644 (file)
--- a/stdio-common/tfformat.c
+++ b/stdio-common/tfformat.c
@@ -4021,6 +4021,8 @@ sprint_double_type sprint_doubles[] =
   {__LINE__, 0.000098,                 "0.0001", "%#.0g"},
   {__LINE__, 0.0000996,                        "0.00010", "%#.2g"},
   {__LINE__, 9.999999999999999e-05,    "0.0001", "%g"},
+  {__LINE__, 1.0,                      "1.000000e+00", "%e"},
+  {__LINE__, .9999999999999999,                "1.000000e+00", "%e"},
 
   {0 }