From b980803a6e89c8e8b951fe6090fca8f083ef4687 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 27 Jan 2008 14:33:37 +0000
Subject: [PATCH] * sprintf.c (rb_str_format): fix for left justify flag.

* sprintf.c (rb_str_format): zero-precision zero bug revised.
  [ruby-dev:33419]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 sprintf.c | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8cddc5cd60..adfdf9a6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan 27 23:33:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix for left justify flag.
+
+	* sprintf.c (rb_str_format): zero-precision zero bug revised.
+	  [ruby-dev:33419]
+
 Sun Jan 27 23:20:54 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/oniguruma.h: precise mbclen API redesigned to avoid
diff --git a/sprintf.c b/sprintf.c
index e3273eb72e..0682c642cc 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -699,12 +699,15 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		if (prefix) {
 		    width -= strlen(prefix);
 		}
-		if ((flags&(FZERO|FPREC)) == FZERO) {
+		if ((flags & (FZERO|FMINUS|FPREC)) == FZERO) {
 		    prec = width;
 		    width = 0;
 		}
 		else {
-		    if (prec < len) prec = len;
+		    if (prec < len) {
+			if ((flags & FPREC) && len == 1 && *s == '0') len = 0;
+			else prec = len;
+		    }
 		    width -= prec;
 		}
 		if (!(flags&FMINUS)) {
@@ -726,7 +729,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 			buf[blen++] = c;
 		    }
 		}
-		else {
+		else if ((flags & (FMINUS|FPREC)) != FMINUS) {
 		    char c;
 
 		    if (!sign && bignum && !RBIGNUM_SIGN(val))