shyouhei	2008-06-15 22:16:03 +0900 (Sun, 15 Jun 2008)

  New Revision: 17248

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/time.c
    branches/ruby_1_8_5/version.h

  Log:
    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]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/time.c?r1=17248&r2=17247&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17248&r2=17247&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17248&r2=17247&diff_format=u

Index: ruby_1_8_5/time.c
===================================================================
--- ruby_1_8_5/time.c	(revision 17247)
+++ ruby_1_8_5/time.c	(revision 17248)
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #endif
 
+#include <errno.h>
 #include <math.h>
 
 VALUE rb_cTime;
@@ -1776,8 +1777,9 @@
     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';
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17247)
+++ ruby_1_8_5/ChangeLog	(revision 17248)
@@ -1,3 +1,9 @@
+Sun Jun 15 22:13:13 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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@i...>
 
 	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17247)
+++ ruby_1_8_5/version.h	(revision 17248)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/