summaryrefslogtreecommitdiffstats
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
commit3de25caf11f9df45949b437e01737b44b1bc9d05 (patch)
tree7b00bcbf04fb7f9c911f1d27d6318e11f34df8cf
parent409e8e46faaf6407737a03789d18070d05c1d71a (diff)
downloadruby-3de25caf11f9df45949b437e01737b44b1bc9d05.tar.gz
ruby-3de25caf11f9df45949b437e01737b44b1bc9d05.tar.xz
ruby-3de25caf11f9df45949b437e01737b44b1bc9d05.zip
merges r20379 from trunk into ruby_1_9_1.
* strftime.c (rb_strftime): should add padding for %%. git-svn-id: http://svn.ruby-lang.org/repos/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 d386bc189..a9e8b0876 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 79c5fe4fa..248c695e0 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;