[前][次][番号順一覧][スレッド一覧]

ruby-changes:10331

From: shugo <ko1@a...>
Date: Thu, 29 Jan 2009 16:32:27 +0900 (JST)
Subject: [ruby-changes:10331] Ruby:r21875 (trunk): * load.c (rb_feature_provided): should not calculate len by pointer

shugo	2009-01-29 16:32:07 +0900 (Thu, 29 Jan 2009)

  New Revision: 21875

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

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

  Modified files:
    trunk/ChangeLog
    trunk/load.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21874)
+++ ChangeLog	(revision 21875)
@@ -1,3 +1,9 @@
+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.
Index: load.c
===================================================================
--- load.c	(revision 21874)
+++ load.c	(revision 21875)
@@ -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/

[前][次][番号順一覧][スレッド一覧]