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

ruby-changes:18143

From: nobu <ko1@a...>
Date: Fri, 10 Dec 2010 18:35:55 +0900 (JST)
Subject: [ruby-changes:18143] Ruby:r30164 (trunk): * ruby.c (ruby_init_loadpath_safe): relatively called non-shared

nobu	2010-12-10 18:29:22 +0900 (Fri, 10 Dec 2010)

  New Revision: 30164

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

  Log:
    * ruby.c (ruby_init_loadpath_safe): relatively called non-shared
      binary cannot be found in PATH, so use given pathname.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30163)
+++ ChangeLog	(revision 30164)
@@ -1,3 +1,8 @@
+Fri Dec 10 18:29:20 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc.
Index: ruby.c
===================================================================
--- ruby.c	(revision 30163)
+++ ruby.c	(revision 30164)
@@ -380,7 +380,7 @@
 	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);
     }

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

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