summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-03 05:40:56 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-03 05:40:56 +0000
commit34238fc2e0d18aae9e6a0012303e26da2cfb502a (patch)
tree55877413275fe3b28eede0a883e9cc2053cbc231
parent4365377d76020c5cacf03a35989f370d05f5780a (diff)
* eval.c (rb_f_require): should check static linked libraries\
before raising exception(from 1.7). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 05df0048a1..79a5cee6a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 3 14:38:24 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * eval.c (rb_f_require): should check static linked libraries
+ before raising exception(from 1.7).
+
Mon Sep 3 14:17:17 2001 Akinori MUSHA <knu@iDaemons.org>
* error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
diff --git a/eval.c b/eval.c
index 34998c332b..3802568377 100644
--- a/eval.c
+++ b/eval.c
@@ -5420,6 +5420,8 @@ rb_f_require(obj, fname)
fname = rb_find_file(tmp);
goto load_dyna;
}
+ if (rb_feature_p(RSTRING(fname)->ptr, Qfalse))
+ return Qfalse;
rb_raise(rb_eLoadError, "No such file to load -- %s",
RSTRING(fname)->ptr);