yugui	2008-11-30 18:23:04 +0900 (Sun, 30 Nov 2008)

  New Revision: 20411

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20411

  Log:
    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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/strftime.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20410)
+++ ruby_1_9_1/ChangeLog	(revision 20411)
@@ -1,3 +1,11 @@
+Tue Nov 25 07:51:18 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@a...>
 
 	* ext/tk/lib/tkextlib/blt/tabset.rb, 
Index: ruby_1_9_1/strftime.c
===================================================================
--- ruby_1_9_1/strftime.c	(revision 20410)
+++ ruby_1_9_1/strftime.c	(revision 20411)
@@ -286,7 +286,7 @@
 			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 @@
 			break;
 
 		case 's':
-			FMT(' ', 1, "d", (int) ts->tv_sec);
+			FMT('0', 1, "d", (int) ts->tv_sec);
 			continue;
 
 		case 'S':	/* second, 00 - 60 */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/