about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--stdio-common/printf_fp.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ddd487306..2e27fed3b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/printf_fp.c (__printf_fp): Handle decimal point in
+	x.5 rounding correctly.
+
 2000-12-06  Mark Kettenis  <kettenis@gnu.org>
 
 	* stdio-common/perror.c (perror): Conditionalize code dealing with
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 2147b2994d..0f598d87ef 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -923,7 +923,9 @@ __printf_fp (FILE *fp,
       {
 	wchar_t *wtp = wcp;
 
-	if (digit == L'5' && (*(wcp - 1) & 1) == 0)
+	if (digit == L'5'
+	    && ((*(wcp - 1) != decimalwc && (*(wcp - 1) & 1) == 0)
+		|| ((*(wcp - 1) == decimalwc && (*(wcp - 2) & 1) == 0))))
 	  {
 	    /* This is the critical case.	 */
 	    if (fracsize == 1 && frac[0] == 0)