kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r20355 from trunk into ruby_1_9_1.

Browse source 
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-11-30 09:23:23 +00:00
parent 58989128c1
commit 3814096011
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
strftime.c
View file

@ -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;
}