summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-07 21:43:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-07 21:43:54 +0000
commit4264ca9436a7b1496dbd6c9ca6e2e043f0c48630 (patch)
tree9c152e1a97a38c069d33785719148e5723278694 /ruby.c
parent86afcfe4021d3ee7a9d290f2b351ae9e7aa52021 (diff)
* dln.c (dln_find_exe_r, dln_find_file_r): reentrant versions.
* file.c (rb_find_file_ext, rb_find_file), process.c (proc_exec_v), (rb_proc_exec, proc_spawn_v, proc_spawn), ruby.c (process_options): use reentrant versions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ruby.c b/ruby.c
index a0636e3ca7..be0af70aa5 100644
--- a/ruby.c
+++ b/ruby.c
@@ -953,6 +953,7 @@ process_options(VALUE arg)
VALUE parser;
rb_encoding *enc, *lenc;
const char *s;
+ char fbuf[MAXPATHLEN];
int i = proc_options(argc, argv, opt);
int safe;
@@ -1033,10 +1034,10 @@ process_options(VALUE arg)
opt->script = 0;
if (path) {
- opt->script = dln_find_file(argv[0], path);
+ opt->script = dln_find_file_r(argv[0], path, fbuf, sizeof(fbuf));
}
if (!opt->script) {
- opt->script = dln_find_file(argv[0], getenv(PATH_ENV));
+ opt->script = dln_find_file_r(argv[0], getenv(PATH_ENV), fbuf, sizeof(fbuf));
}
if (!opt->script)
opt->script = argv[0];