summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:24:50 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:24:50 +0000
commit7367da56c0e018f8194dd92535f8db9d1983f6d7 (patch)
tree7b00bcbf04fb7f9c911f1d27d6318e11f34df8cf
parentc16831bff746a443f6cfdc111b61c549f0aa0846 (diff)
merges r20379 from trunk into ruby_1_9_1.
* strftime.c (rb_strftime): should add padding for %%. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--strftime.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d386bc189a..a9e8b0876d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
-Thu Nov 27 23:54:37 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Nov 27 21:41:29 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * gc.c (gc_mark): still needs to check stack depth during GC.
-
- * gc.c (stack_check): ditto.
+ * strftime.c (rb_strftime): should add padding for %%.
Thu Nov 27 16:32:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/strftime.c b/strftime.c
index 79c5fe4fa8..248c695e01 100644
--- a/strftime.c
+++ b/strftime.c
@@ -319,6 +319,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
goto unknown;
case '%':
+ FILL_PADDING(1);
*s++ = '%';
continue;