diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-10 09:29:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-10 09:29:22 +0000 |
commit | 1a4bf59430667c73e3b0330882ee17a28cc943c4 (patch) | |
tree | d725140f1d3af16d78428973f941d893af525c68 | |
parent | f5aca8a49ee91812b62617065719e79613bb57f8 (diff) | |
download | ruby-1a4bf59430667c73e3b0330882ee17a28cc943c4.tar.gz |
* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
binary cannot be found in PATH, so use given pathname.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Dec 10 18:29:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (ruby_init_loadpath_safe): relatively called non-shared + binary cannot be found in PATH, so use given pathname. + Fri Dec 10 18:28:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc. @@ -380,7 +380,7 @@ ruby_init_loadpath_safe(int safe_level) VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict); char fbuf[MAXPATHLEN]; char *f = dln_find_file_r(dli.dli_fname, getenv(PATH_ENV), fbuf, sizeof(fbuf)); - VALUE fname = rb_str_new_cstr(f); + VALUE fname = rb_str_new_cstr(f ? f : dli.dli_fname); rb_str_freeze(fname); sopath = rb_realpath_internal(Qnil, fname, 1); } |