diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:17:08 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:17:08 +0000 |
commit | 1efa5d37a11b18f5822a8dc0222ca5de2ad7aa0c (patch) | |
tree | 4fb64d5f883aceb673e8c7a40855fcf6b4261cce /time.c | |
parent | 8f136d8a767cf581d5e6f561aecdbed00444f135 (diff) | |
download | ruby-1efa5d37a11b18f5822a8dc0222ca5de2ad7aa0c.tar.gz |
merge revision(s) 16114:
* time.c (rb_strftime): check errno to detect strftime(3)'s error.
this is workaround for recent version of MSVCRT.
[ruby-dev:34456]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r-- | time.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -18,6 +18,7 @@ #include <unistd.h> #endif +#include <errno.h> #include <math.h> VALUE rb_cTime; @@ -1776,8 +1777,9 @@ rb_strftime(buf, format, time) if (flen == 0) { return 0; } + errno = 0; 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) { *buf = xmalloc(size); (*buf)[0] = '\0'; |