From fbb419442ad1c99a97f9063aed726a0969147d4e Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 30 Nov 2008 09:23:23 +0000 Subject: merges r20355 from trunk into ruby_1_9_1. * strftime.c (rb_strftime): should not swallow incomplete formatter, e.g. "%E". [ruby-dev:37170] fix: #787 * strftime.c (rb_strftime): clear flags before processing unknown formatter, e.g. "%i". [ruby-dev:37180] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- strftime.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'strftime.c') diff --git a/strftime.c b/strftime.c index 5002c56c0..7913c792a 100644 --- a/strftime.c +++ b/strftime.c @@ -310,8 +310,8 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept again: switch (*++format) { case '\0': - *s++ = '%'; - goto out; + format--; + goto unknown; case '%': *s++ = '%'; @@ -762,8 +762,11 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept default: unknown: - tp = sp; i = format - sp + 1; + tp = sp; + precision = -1; + flags = 0; + padding = 0; break; } if (i) { @@ -786,7 +789,6 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept } } } -out: if (s >= endp) { goto err; } -- cgit