From 7889fdd1e6c7a30963b7dd9e181c74cf4423095d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 27 Jan 2008 13:33:41 +0000
Subject: * sprintf.c (rb_str_format): fix for octal with precision.  
 [ruby-dev:33411]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 sprintf.c | 25 +++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07bbb348ca..3eeb969602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 27 22:33:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix for octal with precision.
+	  [ruby-dev:33411]
+
 Sun Jan 27 22:31:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-mode-set-encoding): automatically insert
diff --git a/sprintf.c b/sprintf.c
index 39b74d615e..e3273eb72e 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -535,9 +535,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		      case 'B':
 			prefix = "0B"; break;
 		    }
-		    if (prefix) {
-			width -= strlen(prefix);
-		    }
 		}
 
 	      bin_retry:
@@ -687,15 +684,27 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 			pp++;
 		    }
 		}
+		if (prefix && !prefix[1]) {
+		    if (dots) {
+			prefix = 0;
+		    }
+		    else if (len == 1 && *s == '0') {
+			if (flags & FPREC) len = 0;
+			prefix = 0;
+		    }
+		    else if ((flags & FPREC) && (prec > len)) {
+			prefix = 0;
+		    }
+		}
+		if (prefix) {
+		    width -= strlen(prefix);
+		}
 		if ((flags&(FZERO|FPREC)) == FZERO) {
 		    prec = width;
 		    width = 0;
 		}
 		else {
-		    if (prec < len) {
-			if ((flags & FPREC) && len == 1 && *s == '0') len = 0;
-			else prec = len;
-		    }
+		    if (prec < len) prec = len;
 		    width -= prec;
 		}
 		if (!(flags&FMINUS)) {
@@ -705,7 +714,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		    }
 		}
 		if (sc) PUSH(&sc, 1);
-		if (prefix && (prefix[1] || !(dots || (len && s[0] == '0')))) {
+		if (prefix) {
 		    int plen = strlen(prefix);
 		    PUSH(prefix, plen);
 		}
-- 
cgit v1.2.3