1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* time.c (rb_strftime): check errno to detect strftime(3)'s error.

Browse Source 
this is workaround for recent version of MSVCRT.
	  [ruby-dev:34456]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-04-21 00:59:43 +00:00
parent fd8734a64d
commit 7dd42a48e1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Apr 21 09:58:04 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* time.c (rb_strftime): check errno to detect strftime(3)'s error.
this is workaround for recent version of MSVCRT.
[ruby-dev:34456]
Mon Apr 21 08:54:30 2008 NAKAMURA Usaku <usa@ruby-lang.org> Mon Apr 21 08:54:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* gc.c (ruby_xmalloc): use size_t for malloc argument instead of long. * gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.

3
time.c
View File

@ -2003,8 +2003,9 @@ rb_strftime(char **buf, const char *format, struct tm *time)
if (flen == 0) { if (flen == 0) {
return 0; return 0;
} }
errno = 0;
len = strftime(*buf, SMALLBUF, format, time); len = strftime(*buf, SMALLBUF, format, time);
if (len != 0 || **buf == '\0') return len; if (len != 0 || (**buf == '\0' && errno != ERANGE)) return len;
for (size=1024; ; size*=2) { for (size=1024; ; size*=2) {
*buf = xmalloc(size); *buf = xmalloc(size);
(*buf)[0] = '\0'; (*buf)[0] = '\0';