nobu	2012-04-17 22:18:51 +0900 (Tue, 17 Apr 2012)

  New Revision: 35366

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

  Log:
    * strftime.c (rb_strftime_with_timespec): fix padding of time zone
      offset.  [ruby-dev:43287][Bug #4458]

  Modified files:
    trunk/ChangeLog
    trunk/strftime.c
    trunk/test/ruby/test_time.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35365)
+++ ChangeLog	(revision 35366)
@@ -1,3 +1,8 @@
+Tue Apr 17 22:18:48 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* strftime.c (rb_strftime_with_timespec): fix padding of time zone
+	  offset.  [ruby-dev:43287][Bug #4458]
+
 Tue Apr 17 13:11:14 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* dln.c (rb_w32_check_imported): skip ordinal entries.  based on a
Index: strftime.c
===================================================================
--- strftime.c	(revision 35365)
+++ strftime.c	(revision 35366)
@@ -189,6 +189,9 @@
 	char padding;
 	enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E};
 #define BIT_OF(n) (1U<<(n))
+#ifdef MAILHEADER_EXT
+	int sign;
+#endif
 
 	/* various tables, useful in North America */
 	static const char days_l[][10] = {
@@ -485,11 +488,12 @@
 			}
 			if (off < 0) {
 				off = -off;
-				*s++ = '-';
+				sign = -1;
 			} else {
-				*s++ = '+';
+				sign = +1;
 			}
-			i = snprintf(s, endp - s, (padding == ' ' ? "%*ld" : "%.*ld"), precision, off / 3600);
+			i = snprintf(s, endp - s, (padding == ' ' ? "%+*ld" : "%+.*ld"),
+				     precision + 1, sign * (off / 3600));
 			if (i < 0) goto err;
 			s += i;
                         off = off % 3600;
Index: test/ruby/test_time.rb
===================================================================
--- test/ruby/test_time.rb	(revision 35365)
+++ test/ruby/test_time.rb	(revision 35366)
@@ -668,6 +668,22 @@
 
     bug4457 = '[ruby-dev:43285]'
     assert_raise(Errno::ERANGE, bug4457) {Time.now.strftime('%8192z')}
+
+    bug4458 = '[ruby-dev:43287]'
+    t = T2000.getlocal("+09:00")
+    assert_equal("      +900", t.strftime("%_10z"), bug4458)
+    assert_equal("+000000900", t.strftime("%10z"), bug4458)
+    assert_equal("     +9:00", t.strftime("%_:10z"), bug4458)
+    assert_equal("+000009:00", t.strftime("%:10z"), bug4458)
+    assert_equal("  +9:00:00", t.strftime("%_::10z"), bug4458)
+    assert_equal("+009:00:00", t.strftime("%::10z"), bug4458)
+    t = T2000.getlocal("-05:00")
+    assert_equal("      -500", t.strftime("%_10z"), bug4458)
+    assert_equal("-000000500", t.strftime("%10z"), bug4458)
+    assert_equal("     -5:00", t.strftime("%_:10z"), bug4458)
+    assert_equal("-000005:00", t.strftime("%:10z"), bug4458)
+    assert_equal("  -5:00:00", t.strftime("%_::10z"), bug4458)
+    assert_equal("-005:00:00", t.strftime("%::10z"), bug4458)
   end
 
   def test_delegate

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