summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-03 05:29:19 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-03 05:29:19 +0000
commit4365377d76020c5cacf03a35989f370d05f5780a (patch)
tree3351683d7f4a8991b411dee9dad61f856c42b5e0 /file.c
parent9f1e0829daa572708a0aeb3dddbd33d13cb15693 (diff)
* io.c (rb_io_popen): accept integer flags as mode.
* file.c (rb_find_file_ext): extension table can be supplied from outside. renamed. * eval.c (rb_f_require): replace rb_find_file_noext by rb_find_file_ext. * eval.c (rb_provided): should also check feature without extension. * numeric.c (flo_to_s): do not rely on decimal point to be '.' * parse.y (yylex): ternary ? can be followed by newline. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/file.c b/file.c
index e65c53f7c6..9f437d2b6e 100644
--- a/file.c
+++ b/file.c
@@ -2154,22 +2154,15 @@ file_load_ok(file)
extern VALUE rb_load_path;
int
-rb_find_file_noext(filep)
+rb_find_file_ext(filep, ext)
VALUE *filep;
+ char **ext;
{
char *path, *e, *found;
char *f = RSTRING(*filep)->ptr;
VALUE fname;
int i, j;
- static char *ext[] = {
- ".rb", DLEXT,
-#ifdef DLEXT2
- DLEXT2,
-#endif
- 0
- };
-
if (f[0] == '~') {
fname = *filep;
fname = rb_file_s_expand_path(1, &fname);