[src/trunk]: src/lib/libc/stdio PR/44113: Nicolas Joly: printf(3) should igno...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/728ec0d2a23f
branches:  trunk
changeset: 758870:728ec0d2a23f
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Nov 19 00:44:18 2010 +0000

description:
PR/44113: Nicolas Joly: printf(3) should ignore zero padding for nan/inf

diffstat:

 lib/libc/stdio/vfwprintf.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r c20171ff7616 -r 728ec0d2a23f lib/libc/stdio/vfwprintf.c
--- a/lib/libc/stdio/vfwprintf.c        Thu Nov 18 18:48:05 2010 +0000
+++ b/lib/libc/stdio/vfwprintf.c        Fri Nov 19 00:44:18 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfwprintf.c,v 1.21 2010/07/31 08:47:34 tnozaki Exp $   */
+/*     $NetBSD: vfwprintf.c,v 1.22 2010/11/19 00:44:18 christos Exp $  */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
 #else
-__RCSID("$NetBSD: vfwprintf.c,v 1.21 2010/07/31 08:47:34 tnozaki Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.22 2010/11/19 00:44:18 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -1131,6 +1131,7 @@
                                        result = (ch >= 'a') ? STRCONST("inf") :
                                            STRCONST("INF");
                                size = 3;
+                               flags &= ~ZEROPAD;
                                break;
                        }
 #else
@@ -1161,6 +1162,7 @@
                                else
                                        result = STRCONST("inf");
                                size = 3;
+                               flags &= ~ZEROPAD;
                                break;
                        }
                        if (isnan(_double)) {
@@ -1169,6 +1171,7 @@
                                else
                                        result = STRCONST("nan");
                                size = 3;
+                               flags &= ~ZEROPAD;
                                break;
                        }