From ab085a095342f35d8ff293f98766caf78528ed4a Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 25 Nov 2008 00:24:01 +0000 Subject: * 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/trunk@20352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- strftime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'strftime.c') 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 */ -- cgit