From 30c85e95199e4e0cc5b716ab8580be205a8ee15d Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 29 Jan 2009 17:14:18 +0000 Subject: 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] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 +++++++++- configure.in | 2 +- load.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bcc2f538..017c80b8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -Thu Jan 29 14:08:59 2009 Nobuyoshi Nakada +Thu Jan 29 16:22:41 2009 Shugo Maeda + + * 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 + + * configure.in (BASERUBY): erases RUBYOPT at the test. * configure.in (OBJCOPY): not used on Windows. diff --git a/configure.in b/configure.in index f409ab823..31f259375 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_ARG_WITH(baseruby, [ 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) diff --git a/load.c b/load.c index 8693aef8a..8e66a7571 100644 --- a/load.c +++ b/load.c @@ -128,8 +128,8 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c if (fn) *fn = 0; if (ext) { - len = ext - feature; elen = strlen(ext); + len = strlen(feature) - elen; type = rb ? 'r' : 's'; } else { -- cgit