diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-26 14:46:36 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-26 14:46:36 +0000 |
commit | c5498be6d69d80e6970ecbc0bcc4251b6ebf6668 (patch) | |
tree | 35b8b24bb512bca5d130bf229a678509016a8650 /sprintf.c | |
parent | 38e59c6d2b8c3f9f8913015823c5714e3ffb34ed (diff) | |
download | ruby-c5498be6d69d80e6970ecbc0bcc4251b6ebf6668.tar.gz ruby-c5498be6d69d80e6970ecbc0bcc4251b6ebf6668.tar.xz ruby-c5498be6d69d80e6970ecbc0bcc4251b6ebf6668.zip |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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--) { |