diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 13:33:41 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 13:33:41 +0000 |
commit | 7889fdd1e6c7a30963b7dd9e181c74cf4423095d (patch) | |
tree | a25a1212b8b4f185a020b10897d6c733c9dc0e56 /sprintf.c | |
parent | ce26086b012328e6352059e1a962082b0f6dec04 (diff) | |
download | ruby-7889fdd1e6c7a30963b7dd9e181c74cf4423095d.tar.gz |
* 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
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 25 |
1 files changed, 17 insertions, 8 deletions
@@ -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); } |