nobu	2008-05-17 12:36:48 +0900 (Sat, 17 May 2008)

  New Revision: 16443

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/file.c
    branches/ruby_1_8_5/version.h
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/file.c
    branches/ruby_1_8_6/version.h

  Log:
    * file.c (file_expand_path): rb_str_set_len is not backported.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16443&r2=16442&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16443&r2=16442&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/file.c?r1=16443&r2=16442&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16443&r2=16442&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16443&r2=16442&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/file.c?r1=16443&r2=16442&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16442)
+++ ruby_1_8_5/ChangeLog	(revision 16443)
@@ -1,3 +1,7 @@
+Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (file_expand_path): rb_str_set_len is not backported.
+
 Sat May 17 12:15:48 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): support for alternative data stream
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16442)
+++ ruby_1_8_5/version.h	(revision 16443)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-05-17"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 115
+#define RUBY_PATCHLEVEL 116
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/file.c
===================================================================
--- ruby_1_8_5/file.c	(revision 16442)
+++ ruby_1_8_5/file.c	(revision 16443)
@@ -2727,8 +2727,9 @@
     if (p == skiproot(buf) - 1) p++;
     buflen = p - buf;
 
+    RSTRING(result)->len = buflen;
+    *p = '\0';
 #if USE_NTFS
-    *p = '\0';
     if (!strpbrk(b = buf, "*?")) {
 	size_t len;
 	WIN32_FIND_DATA wfd;
@@ -2779,7 +2780,6 @@
 #endif
 
     if (tainted) OBJ_TAINT(result);
-    rb_str_set_len(result, buflen);
     return result;
 }
 
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 16442)
+++ ruby_1_8_6/ChangeLog	(revision 16443)
@@ -1,3 +1,7 @@
+Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (file_expand_path): rb_str_set_len is not backported.
+
 Sat May 17 12:15:48 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): support for alternative data stream
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16442)
+++ ruby_1_8_6/version.h	(revision 16443)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-05-17"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 114
+#define RUBY_PATCHLEVEL 115
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/file.c
===================================================================
--- ruby_1_8_6/file.c	(revision 16442)
+++ ruby_1_8_6/file.c	(revision 16443)
@@ -2740,8 +2740,9 @@
     if (p == skiproot(buf) - 1) p++;
     buflen = p - buf;
 
+    RSTRING(result)->len = buflen;
+    *p = '\0';
 #if USE_NTFS
-    *p = '\0';
     if (!strpbrk(b = buf, "*?")) {
 	size_t len;
 	WIN32_FIND_DATA wfd;
@@ -2792,7 +2793,6 @@
 #endif
 
     if (tainted) OBJ_TAINT(result);
-    rb_str_set_len(result, buflen);
     return result;
 }
 

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