nobu	2010-04-11 16:37:13 +0900 (Sun, 11 Apr 2010)

  New Revision: 27305

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

  Log:
    * ruby.c (ruby_init_loadpath): do not mangle relative path.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ruby.c

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27304)
+++ ruby_1_8/ChangeLog	(revision 27305)
@@ -1,5 +1,7 @@
-Sun Apr 11 11:28:53 2010  Nobuyoshi Nakada  <nobu@r...>
+Sun Apr 11 16:37:12 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* ruby.c (ruby_init_loadpath): do not mangle relative path.
+
 	* ruby.c (ruby_init_loadpath): fix for the length of mangled path.
 	  [ruby-core:29398]
 
Index: ruby_1_8/ruby.c
===================================================================
--- ruby_1_8/ruby.c	(revision 27304)
+++ ruby_1_8/ruby.c	(revision 27305)
@@ -251,7 +251,6 @@
     char libpath[FILENAME_MAX+1];
     size_t baselen;
     char *p;
-    int rest;
 #if defined _WIN32 || defined __CYGWIN__
     HMODULE libruby = NULL;
     MEMORY_BASIC_INFORMATION m;
@@ -297,9 +296,9 @@
 #define PREFIX_PATH() rb_str_new(libpath, baselen)
 
     baselen = p - libpath;
-    rest = FILENAME_MAX - baselen;
+#define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen)
 
-#define RUBY_RELATIVE(path, len) (strncpy(p, (path), rest), rubylib_mangled_path(libpath, baselen+(len)))
+#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), path, len)
 #else
     static const char exec_prefix[] = RUBY_EXEC_PREFIX;
 #define RUBY_RELATIVE(path, len) rubylib_mangled_path(path, len)

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