1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* strftime.c (rb_strftime): Time.mktime(2000).strftime("%-S") should

return "0", not "".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2008-08-28 15:01:07 +00:00
parent 5ef4c56784
commit 6a7481c38d
3 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Thu Aug 28 23:55:50 2008 Shugo Maeda <shugo@ruby-lang.org>
* strftime.c (rb_strftime): Time.mktime(2000).strftime("%-S") should
return "0", not "".
* test/ruby/test_time.rb: ditto.
Thu Aug 28 23:55:22 2008 Yusuke Endoh <mame@tsg.ne.jp> Thu Aug 28 23:55:22 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_time.rb: suppress warning during test. * test/ruby/test_time.rb: suppress warning during test.

View file

@ -275,7 +275,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
do { \ do { \
int l; \ int l; \
if (precision <= 0) precision = (def_prec); \ if (precision <= 0) precision = (def_prec); \
if (flags & BIT_OF(LEFT)) precision = 0; \ if (flags & BIT_OF(LEFT)) precision = 1; \
l = snprintf(s, endp - s, \ l = snprintf(s, endp - s, \
((!padding || padding == (def_pad)) ? "%.*"fmt : "%*"fmt), \ ((!padding || padding == (def_pad)) ? "%.*"fmt : "%*"fmt), \
precision, val); \ precision, val); \

View file

@ -382,6 +382,7 @@ class TestTime < Test::Unit::TestCase
assert_equal("2000", T2000.strftime("%Y")) assert_equal("2000", T2000.strftime("%Y"))
assert_equal("UTC", T2000.strftime("%Z")) assert_equal("UTC", T2000.strftime("%Z"))
assert_equal("%", T2000.strftime("%%")) assert_equal("%", T2000.strftime("%%"))
assert_equal("0", T2000.strftime("%-S"))
assert_equal("", T2000.strftime("")) assert_equal("", T2000.strftime(""))
assert_equal("foo\0bar\x0000\x0000\x0000", T2000.strftime("foo\0bar\0%H\0%M\0%S")) assert_equal("foo\0bar\x0000\x0000\x0000", T2000.strftime("foo\0bar\0%H\0%M\0%S"))