* sprintf.c (rb_str_format): zero-precision zero should be empty.

  [ruby-dev:33363]

* sprintf.c (rb_str_format): not prepend octal prefix to negative or
  zero value.  [ruby-dev:33363], [ruby-dev:33367]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index ee3087860f..f651564776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jan 26 23:46:33 2008  Nobuyoshi Nakada  <[email protected]>
+
+	* sprintf.c (rb_str_format): zero-precision zero should be empty.
+	  [ruby-dev:33363]
+
+	* sprintf.c (rb_str_format): not prepend octal prefix to negative or
+	  zero value.  [ruby-dev:33363], [ruby-dev:33367]
+
 Sat Jan 26 23:42:15 2008  Nobuyoshi Nakada  <[email protected]>
 
 	* parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.
diff --git a/sprintf.c b/sprintf.c
index 3be46b55af..39b74d615e 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -692,7 +692,10 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		    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)) {
@@ -702,15 +705,12 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		    }
 		}
 		if (sc) PUSH(&sc, 1);
-		if (prefix) {
+		if (prefix && (prefix[1] || !(dots || (len && s[0] == '0')))) {
 		    int plen = strlen(prefix);
 		    PUSH(prefix, plen);
 		}
 		CHECK(prec - len);
-		if (dots) {
-		    memcpy(&buf[blen], "..", 2);
-		    blen += 2;
-		}
+		if (dots) PUSH("..", 2);
 		if (!bignum && v < 0) {
 		    char c = sign_bits(base, p);
 		    while (len < prec--) {