yugui	2010-08-09 13:40:14 +0900 (Mon, 09 Aug 2010)

  New Revision: 28935

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28935

  Log:
    merges r28885 from trunk into ruby_1_9_2.
    --
    * file.c (realpath_rec): rb_str_modify depends on the length, so
      resize instead.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/file.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28934)
+++ ruby_1_9_2/ChangeLog	(revision 28935)
@@ -1,3 +1,8 @@
+Fri Aug  6 18:59:23 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (realpath_rec): rb_str_modify depends on the length, so
+	  resize instead.
+
 Thu Aug  5 21:20:31 2010  Yusuke Endoh  <mame@t...>
 
 	* compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
Index: ruby_1_9_2/file.c
===================================================================
--- ruby_1_9_2/file.c	(revision 28934)
+++ ruby_1_9_2/file.c	(revision 28935)
@@ -3216,7 +3216,7 @@
                 char *resolved_names = RSTRING_PTR(*resolvedp) + *prefixlenp;
                 char *lastsep = rb_path_last_separator(resolved_names);
                 long len = lastsep ? lastsep - resolved_names : 0;
-                rb_str_set_len(*resolvedp, *prefixlenp + len);
+                rb_str_resize(*resolvedp, *prefixlenp + len);
             }
         }
         else {

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