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_5@17248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1cbf21ebbd..72e4667ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 22:13:13 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]
+
 Sun Jun 15 22:10:14 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
diff --git a/time.c b/time.c
index b8da8633a8..308544e9cb 100644
--- a/time.c
+++ b/time.c
@@ -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';
diff --git a/version.h b/version.h
index d4b40c6d85..e5b60cdfed 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 195
+#define RUBY_PATCHLEVEL 196
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8