diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-28 05:29:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-28 05:29:56 +0000 |
commit | 99c8c71243dafbbe29e12cea325d65b180687e8e (patch) | |
tree | 457ff378bbec8e8434251317e7797d4ce4926910 | |
parent | a95b2fde601ac0adc1285f1d206f8b9ef45eb279 (diff) | |
download | bundler-99c8c71243dafbbe29e12cea325d65b180687e8e.tar.gz |
* dln.c (load_lib): use dln_find_file_r instead of dln_find_file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | dln.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Mon Jul 28 14:29:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dln.c (load_lib): use dln_find_file_r instead of dln_find_file. + Mon Jul 28 00:18:47 2008 Yusuke Endoh <mame@tsg.ne.jp> * vm_core.h, thread.c: It is now prohibited to use Data_Get_Struct in @@ -911,7 +911,7 @@ char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH; static int load_lib(const char *lib) { - char *path, *file; + char *path, *file, fbuf[MAXPATHLEN]; char armagic[SARMAG]; int fd, size; struct ar_hdr ahdr; @@ -942,7 +942,7 @@ load_lib(const char *lib) path = getenv("DLN_LIBRARY_PATH"); if (path == NULL) path = dln_librrb_ary_path; - file = dln_find_file(lib, path); + file = dln_find_file_r(lib, path, fbuf, sizeof(fbuf)); fd = open(file, O_RDONLY); if (fd == -1) goto syserr; size = read(fd, armagic, SARMAG); |