diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sprintf.c | 35 |
2 files changed, 21 insertions, 19 deletions
@@ -1,3 +1,8 @@ +Wed Jul 26 17:28:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum, + but not "-". fixed: [ruby-core:08167] + Wed Jul 26 16:39:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_scan): add string modification check. @@ -626,27 +626,24 @@ rb_f_sprintf(argc, argv) if (*s == '-') { if (base == 10) { rb_warning("negative number for %%u specifier"); - s++; } - else { - remove_sign_bits(++s, base); - tmp = rb_str_new(0, 3+strlen(s)); - t = RSTRING(tmp)->ptr; - if (!(flags&(FPREC|FZERO))) { - strcpy(t, ".."); - t += 2; - } - switch (base) { - case 16: - if (s[0] != 'f') strcpy(t++, "f"); break; - case 8: - if (s[0] != '7') strcpy(t++, "7"); break; - case 2: - if (s[0] != '1') strcpy(t++, "1"); break; - } - strcpy(t, s); - bignum = 2; + remove_sign_bits(++s, base); + tmp = rb_str_new(0, 3+strlen(s)); + t = RSTRING(tmp)->ptr; + if (!(flags&(FPREC|FZERO))) { + strcpy(t, ".."); + t += 2; + } + switch (base) { + case 16: + if (s[0] != 'f') strcpy(t++, "f"); break; + case 8: + if (s[0] != '7') strcpy(t++, "7"); break; + case 2: + if (s[0] != '1') strcpy(t++, "1"); break; } + strcpy(t, s); + bignum = 2; } s = RSTRING(tmp)->ptr; |