about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-04-30 22:33:44 +0000
committerUlrich Drepper <drepper@redhat.com>2007-04-30 22:33:44 +0000
commitb866373d82d6378a4ae22bab1a00f8e012b7da68 (patch)
tree8f4db6080f45ecb68b369d07f84775d098c04106 /stdio-common
parent37f02b1da57eb6807e849a5056bf973db840dd78 (diff)
downloadglibc-b866373d82d6378a4ae22bab1a00f8e012b7da68.tar.gz
glibc-b866373d82d6378a4ae22bab1a00f8e012b7da68.tar.xz
glibc-b866373d82d6378a4ae22bab1a00f8e012b7da68.zip
* 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.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf_fp.c8
-rw-r--r--stdio-common/tfformat.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 9b796eac2f..6e5ff5855b 100644
--- 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 259e2e0b18..d67b3b504d 100644
--- 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 }