diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:04 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:04 +0000 |
| commit | c80ab61ac44bbf6054def9c08ec0a23809c1c363 (patch) | |
| tree | 221e548c25fc2c1da9d98c3aa41d1b885956a525 | |
| parent | eb3c43d0830eec497618fcf66c260d0fcb556e0b (diff) | |
| download | ruby-c80ab61ac44bbf6054def9c08ec0a23809c1c363.tar.gz ruby-c80ab61ac44bbf6054def9c08ec0a23809c1c363.tar.xz ruby-c80ab61ac44bbf6054def9c08ec0a23809c1c363.zip | |
merges r20352 from trunk into ruby_1_9_1.
* strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d".
[ruby-dev:37168] fix: #768
* strftime.c (rb_strftime): %s to use zero padding by default.
[ruby-dev:37180]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | strftime.c | 4 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Tue Nov 25 07:51:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d". + [ruby-dev:37168] fix: #768 + + * strftime.c (rb_strftime): %s to use zero padding by default. + [ruby-dev:37180] + Tue Nov 25 03:37:42 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tkextlib/blt/tabset.rb, diff --git a/strftime.c b/strftime.c index d6d1f8bd3..98e193c39 100644 --- a/strftime.c +++ b/strftime.c @@ -286,7 +286,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept if (precision <= 0) precision = (def_prec); \ if (flags & BIT_OF(LEFT)) precision = 1; \ l = snprintf(s, endp - s, \ - ((padding == '0' || (!padding && def_pad == '0')) ? "%.*"fmt : "%*"fmt), \ + ((padding == '0' || (!padding && def_pad == '0')) ? "%0*"fmt : "%*"fmt), \ precision, val); \ if (l < 0) goto err; \ s += l; \ @@ -417,7 +417,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept break; case 's': - FMT(' ', 1, "d", (int) ts->tv_sec); + FMT('0', 1, "d", (int) ts->tv_sec); continue; case 'S': /* second, 00 - 60 */ |