From a12e0a991b6522b06ce955982dec6db47bb127ff Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Jul 2004 02:20:00 +0000
Subject: * sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with  
 "%f" or etc on MSVCRT platforms. (backported from HEAD)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 sprintf.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 26486fcccf..a9a182574e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 16 11:17:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
+	  "%f" or etc on MSVCRT platforms. (backported from HEAD)
+
 Fri Jul 16 11:17:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
diff --git a/sprintf.c b/sprintf.c
index 405f24dd44..c3ba21b8a4 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -690,6 +690,63 @@ rb_f_sprintf(argc, argv)
 		char fbuf[32];
 
 		fval = RFLOAT(rb_Float(val))->value;
+#if defined(_WIN32) && !defined(__BORLANDC__)
+		if (isnan(fval) || isinf(fval)) {
+		    char *expr;
+
+		    if  (isnan(fval)) {
+			expr = "NaN";
+		    }
+		    else {
+			expr = "Inf";
+		    }
+		    need = strlen(expr);
+		    if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
+			need++;
+		    if ((flags & FWIDTH) && need < width)
+			need = width;
+
+		    CHECK(need);
+		    sprintf(&buf[blen], "%*s", need, "");
+		    if (flags & FMINUS) {
+			if (!isnan(fval) && fval < 0.0)
+			    buf[blen++] = '-';
+			else if (flags & FPLUS)
+			    buf[blen++] = '+';
+			else if (flags & FSPACE)
+			    blen++;
+			strncpy(&buf[blen], expr, strlen(expr));
+		    }
+		    else if (flags & FZERO) {
+			if (!isnan(fval) && fval < 0.0) {
+			    buf[blen++] = '-';
+			    need--;
+			}
+			else if (flags & FPLUS) {
+			    buf[blen++] = '+';
+			    need--;
+			}
+			else if (flags & FSPACE) {
+			    blen++;
+			    need--;
+			}
+			while (need-- - strlen(expr) > 0) {
+			    buf[blen++] = '0';
+			}
+			strncpy(&buf[blen], expr, strlen(expr));
+		    }
+		    else {
+			if (!isnan(fval) && fval < 0.0)
+			    buf[blen + need - strlen(expr) - 1] = '-';
+			else if (flags & FPLUS)
+			    buf[blen + need - strlen(expr) - 1] = '+';
+			strncpy(&buf[blen + need - strlen(expr)], expr,
+				strlen(expr));
+		    }
+		    blen += strlen(&buf[blen]);
+		    break;
+		}
+#endif	/* defined(_WIN32) && !defined(__BORLANDC__) */
 		fmt_setup(fbuf, *p, flags, width, prec);
 		need = 0;
 		if (*p != 'e' && *p != 'E') {
-- 
cgit v1.2.3