yugui	2009-01-30 02:14:18 +0900 (Fri, 30 Jan 2009)

  New Revision: 21881

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

  Log:
    merges r21875 from trunk into ruby_1_9_1.
    * load.c (rb_feature_provided): should not calculate len by pointer
      subtraction because feature may be a expanded path.
      [ruby-core:21267]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/configure.in
    branches/ruby_1_9_1/load.c

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 21880)
+++ ruby_1_9_1/configure.in	(revision 21881)
@@ -18,7 +18,7 @@
 	[
 		BASERUBY="ruby"
 	])
-test "`$BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
+test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
 AC_SUBST(BASERUBY)
 
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21880)
+++ ruby_1_9_1/ChangeLog	(revision 21881)
@@ -1,5 +1,13 @@
-Thu Jan 29 14:08:59 2009  Nobuyoshi Nakada  <nobu@r...>
+Thu Jan 29 16:22:41 2009  Shugo Maeda  <shugo@r...>
 
+	* load.c (rb_feature_provided): should not calculate len by pointer
+	  subtraction because feature may be a expanded path.
+	  [ruby-core:21267]
+
+Thu Jan 29 14:12:15 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (BASERUBY): erases RUBYOPT at the test.
+
 	* configure.in (OBJCOPY): not used on Windows.
 
 Thu Jan 29 12:29:51 2009  Nobuyoshi Nakada  <nobu@r...>
Index: ruby_1_9_1/load.c
===================================================================
--- ruby_1_9_1/load.c	(revision 21880)
+++ ruby_1_9_1/load.c	(revision 21881)
@@ -128,8 +128,8 @@
 
     if (fn) *fn = 0;
     if (ext) {
-	len = ext - feature;
 	elen = strlen(ext);
+	len = strlen(feature) - elen;
 	type = rb ? 'r' : 's';
     }
     else {

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