From 1efa5d37a11b18f5822a8dc0222ca5de2ad7aa0c Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 13:17:08 +0000 Subject: 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 --- ChangeLog | 6 ++++++ time.c | 4 +++- version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a1f2dab24..a03acf5048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 22:16:21 2008 NAKAMURA Usaku + + * time.c (rb_strftime): check errno to detect strftime(3)'s error. + this is workaround for recent version of MSVCRT. + [ruby-dev:34456] + Sun Jun 15 22:12:07 2008 Akinori MUSHA * lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit; diff --git a/time.c b/time.c index 00061f78ff..97eeb6a365 100644 --- a/time.c +++ b/time.c @@ -18,6 +18,7 @@ #include #endif +#include #include 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'; diff --git a/version.h b/version.h index 510e846067..87c873afc4 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 196 +#define RUBY_PATCHLEVEL 197 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3