diff options
| -rw-r--r-- | file.c | 38 | ||||
| -rw-r--r-- | internal/file.h | 14 | ||||
| -rw-r--r-- | internal/parse.h | 3 | ||||
| -rw-r--r-- | load.c | 46 | ||||
| -rw-r--r-- | ruby.c | 23 | ||||
| -rw-r--r-- | win32/file.c | 4 |
6 files changed, 27 insertions, 101 deletions
@@ -6359,7 +6359,7 @@ ruby_is_fd_loadable(int fd) #ifndef _WIN32 int -rb_file_load_ok(const char *path, struct ruby_file_load_state *fls) +rb_file_load_ok(const char *path) { int ret = 1; /* @@ -6381,21 +6381,10 @@ rb_file_load_ok(const char *path, struct ruby_file_load_state *fls) } rb_update_max_fd(fd); ret = ruby_is_fd_loadable(fd); - -#if defined(DOSISH) || defined(__CYGWIN__) - fls = NULL; /* need to set xflag via open_load_file */ -#endif - if (ret && fls) { - /* TODO: avoid path object alloc in rb_io_fdopen */ - fls->filev = rb_io_fdopen(fd, mode, path); - fls->is_fifo = ret < 0 ? 1 : 0; - fls->is_nonblock = mode == O_RDONLY ? 0 : 1; - } else { - (void)close(fd); - } + (void)close(fd); return ret; } -#endif /* !_WIN32 */ +#endif static int is_explicit_relative(const char *path) @@ -6421,13 +6410,6 @@ copy_path_class(VALUE path, VALUE orig) int rb_find_file_ext(VALUE *filep, const char *const *ext) { - return ruby_find_file_ext(filep, ext, NULL); -} - -int -ruby_find_file_ext(VALUE *filep, const char *const *ext, - struct ruby_file_load_state *fls) -{ const char *f = StringValueCStr(*filep); VALUE fname = *filep, load_path, tmp; long i, j, fnlen; @@ -6447,7 +6429,7 @@ ruby_find_file_ext(VALUE *filep, const char *const *ext, fnlen = RSTRING_LEN(fname); for (i=0; ext[i]; i++) { rb_str_cat2(fname, ext[i]); - if (rb_file_load_ok(RSTRING_PTR(fname), fls)) { + if (rb_file_load_ok(RSTRING_PTR(fname))) { *filep = copy_path_class(fname, *filep); return (int)(i+1); } @@ -6472,7 +6454,7 @@ ruby_find_file_ext(VALUE *filep, const char *const *ext, RB_GC_GUARD(str) = rb_get_path(str); if (RSTRING_LEN(str) == 0) continue; rb_file_expand_path_internal(fname, str, 0, 0, tmp); - if (rb_file_load_ok(RSTRING_PTR(tmp), fls)) { + if (rb_file_load_ok(RSTRING_PTR(tmp))) { *filep = copy_path_class(tmp, *filep); return (int)(j+1); } @@ -6487,12 +6469,6 @@ ruby_find_file_ext(VALUE *filep, const char *const *ext, VALUE rb_find_file(VALUE path) { - return ruby_find_file(path, NULL); -} - -VALUE -ruby_find_file(VALUE path, struct ruby_file_load_state *fls) -{ VALUE tmp, load_path; const char *f = StringValueCStr(path); int expanded = 0; @@ -6505,7 +6481,7 @@ ruby_find_file(VALUE path, struct ruby_file_load_state *fls) } if (expanded || rb_is_absolute_path(f) || is_explicit_relative(f)) { - if (!rb_file_load_ok(f, fls)) return 0; + if (!rb_file_load_ok(f)) return 0; if (!expanded) path = copy_path_class(file_expand_path_1(path), path); return path; @@ -6523,7 +6499,7 @@ ruby_find_file(VALUE path, struct ruby_file_load_state *fls) if (RSTRING_LEN(str) > 0) { rb_file_expand_path_internal(path, str, 0, 0, tmp); f = RSTRING_PTR(tmp); - if (rb_file_load_ok(f, fls)) goto found; + if (rb_file_load_ok(f)) goto found; } } rb_str_resize(tmp, 0); diff --git a/internal/file.h b/internal/file.h index 2768418ac5..9c192ff4d1 100644 --- a/internal/file.h +++ b/internal/file.h @@ -11,14 +11,6 @@ #include "ruby/ruby.h" /* for VALUE */ #include "ruby/encoding.h" /* for rb_encodinng */ -struct ruby_file_load_state { - /* TODO: consider stuffing `VALUE fname' here */ - VALUE filev; - unsigned int is_fifo:1; - unsigned int is_nonblock:1; - /* TODO: DOSISH / __CYGWIN__ maintainer may add xflag here */ -}; - /* file.c */ extern const char ruby_null_device[]; VALUE rb_home_dir_of(VALUE user, VALUE result); @@ -26,16 +18,12 @@ VALUE rb_default_home_dir(VALUE result); VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict); VALUE rb_check_realpath(VALUE basedir, VALUE path, rb_encoding *origenc); void rb_file_const(const char*, VALUE); -int rb_file_load_ok(const char *, struct ruby_file_load_state *); +int rb_file_load_ok(const char *); VALUE rb_file_expand_path_fast(VALUE, VALUE); VALUE rb_file_expand_path_internal(VALUE, VALUE, int, int, VALUE); VALUE rb_get_path_check_to_string(VALUE); VALUE rb_get_path_check_convert(VALUE); int ruby_is_fd_loadable(int fd); -int ruby_disable_nonblock(int fd); -int ruby_find_file_ext(VALUE *filep, const char *const *ext, - struct ruby_file_load_state *); -VALUE ruby_find_file(VALUE path, struct ruby_file_load_state *); RUBY_SYMBOL_EXPORT_BEGIN /* file.c (export) */ diff --git a/internal/parse.h b/internal/parse.h index 7cadd0cd5b..f242c384ad 100644 --- a/internal/parse.h +++ b/internal/parse.h @@ -10,13 +10,10 @@ */ #include "ruby/ruby.h" /* for VALUE */ struct rb_iseq_struct; /* in vm_core.h */ -struct ruby_file_load_state; /* internal/file.h */ /* parse.y */ VALUE rb_parser_set_yydebug(VALUE, VALUE); void *rb_parser_load_file(VALUE parser, VALUE name); -void *rb_parser_load_state(VALUE parser, VALUE name, - struct ruby_file_load_state *); void rb_parser_keep_script_lines(VALUE vparser); void rb_parser_error_tolerant(VALUE vparser); void rb_parser_keep_tokens(VALUE vparser); @@ -676,8 +676,7 @@ rb_provide(const char *feature) NORETURN(static void load_failed(VALUE)); static inline void -load_iseq_eval(rb_execution_context_t *ec, VALUE fname, - struct ruby_file_load_state *fls) +load_iseq_eval(rb_execution_context_t *ec, VALUE fname) { const rb_iseq_t *iseq = rb_iseq_load_iseq(fname); @@ -687,7 +686,7 @@ load_iseq_eval(rb_execution_context_t *ec, VALUE fname, rb_ast_t *ast; VALUE parser = rb_parser_new(); rb_parser_set_context(parser, NULL, FALSE); - ast = (rb_ast_t *)rb_parser_load_state(parser, fname, fls); + ast = (rb_ast_t *)rb_parser_load_file(parser, fname); iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit("<top (required)>"), fname, rb_realpath_internal(Qnil, fname, 1), NULL); rb_ast_dispose(ast); @@ -699,8 +698,7 @@ load_iseq_eval(rb_execution_context_t *ec, VALUE fname, } static inline enum ruby_tag_type -load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper, - struct ruby_file_load_state *fls) +load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper) { enum ruby_tag_type state; rb_thread_t *th = rb_ec_thread_ptr(ec); @@ -720,7 +718,7 @@ load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper, EC_PUSH_TAG(ec); state = EC_EXEC_TAG(); if (state == TAG_NONE) { - load_iseq_eval(ec, fname, fls); + load_iseq_eval(ec, fname); } EC_POP_TAG(); @@ -746,7 +744,7 @@ raise_load_if_failed(rb_execution_context_t *ec, enum ruby_tag_type state) } static void -rb_load_internal(VALUE fname, VALUE wrap, struct ruby_file_load_state *fls) +rb_load_internal(VALUE fname, VALUE wrap) { rb_execution_context_t *ec = GET_EC(); enum ruby_tag_type state = TAG_NONE; @@ -754,10 +752,10 @@ rb_load_internal(VALUE fname, VALUE wrap, struct ruby_file_load_state *fls) if (!RB_TYPE_P(wrap, T_MODULE)) { wrap = rb_module_new(); } - state = load_wrapping(ec, fname, wrap, fls); + state = load_wrapping(ec, fname, wrap); } else { - load_iseq_eval(ec, fname, fls); + load_iseq_eval(ec, fname); } raise_load_if_failed(ec, state); } @@ -765,10 +763,9 @@ rb_load_internal(VALUE fname, VALUE wrap, struct ruby_file_load_state *fls) void rb_load(VALUE fname, int wrap) { - struct ruby_file_load_state fls = { .filev = Qfalse }; - VALUE tmp = ruby_find_file(FilePathValue(fname), &fls); + VALUE tmp = rb_find_file(FilePathValue(fname)); if (!tmp) load_failed(fname); - rb_load_internal(tmp, RBOOL(wrap), &fls); + rb_load_internal(tmp, RBOOL(wrap)); } void @@ -820,7 +817,6 @@ static VALUE rb_f_load(int argc, VALUE *argv, VALUE _) { VALUE fname, wrap, path, orig_fname; - struct ruby_file_load_state fls = { .filev = Qfalse }; rb_scan_args(argc, argv, "11", &fname, &wrap); @@ -828,13 +824,13 @@ rb_f_load(int argc, VALUE *argv, VALUE _) fname = rb_str_encode_ospath(orig_fname); RUBY_DTRACE_HOOK(LOAD_ENTRY, RSTRING_PTR(orig_fname)); - path = ruby_find_file(fname, &fls); + path = rb_find_file(fname); if (!path) { - if (!rb_file_load_ok(RSTRING_PTR(fname), &fls)) + if (!rb_file_load_ok(RSTRING_PTR(fname))) load_failed(orig_fname); path = fname; } - rb_load_internal(path, wrap, &fls); + rb_load_internal(path, wrap); RUBY_DTRACE_HOOK(LOAD_RETURN, RSTRING_PTR(orig_fname)); @@ -965,8 +961,7 @@ rb_f_require_relative(VALUE obj, VALUE fname) typedef int (*feature_func)(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn); static int -search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, - feature_func rb_feature_p, struct ruby_file_load_state *fls) +search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_feature_p) { VALUE tmp; char *ext, *ftptr; @@ -981,7 +976,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, if (loading) *path = rb_filesystem_str_new_cstr(loading); return 'r'; } - if ((tmp = ruby_find_file(fname, fls)) != 0) { + if ((tmp = rb_find_file(fname)) != 0) { ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); if (!rb_feature_p(vm, ftptr, ext, TRUE, TRUE, &loading) || loading) *path = tmp; @@ -1022,7 +1017,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, return 'r'; } tmp = fname; - type = ruby_find_file_ext(&tmp, ft == 's' ? ruby_ext : loadable_ext, fls); + type = rb_find_file_ext(&tmp, ft == 's' ? ruby_ext : loadable_ext); #if EXTSTATIC if (!ft && type != 1) { // not already a feature and not found as a dynamic library VALUE lookup_name = tmp; @@ -1108,7 +1103,7 @@ rb_resolve_feature_path(VALUE klass, VALUE fname) fname = rb_get_path(fname); path = rb_str_encode_ospath(fname); - found = search_required(GET_VM(), path, &path, no_feature_p, NULL); + found = search_required(GET_VM(), path, &path, no_feature_p); switch (found) { case 'r': @@ -1168,7 +1163,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa VALUE realpaths = get_loaded_features_realpaths(th->vm); volatile bool reset_ext_config = false; struct rb_ext_config prev_ext_config; - struct ruby_file_load_state fls = { .filev = Qfalse }; fname = rb_get_path(fname); path = rb_str_encode_ospath(fname); @@ -1183,7 +1177,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa int found; RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname)); - found = search_required(th->vm, path, &saved_path, rb_feature_p, &fls); + found = search_required(th->vm, path, &saved_path, rb_feature_p); RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname)); path = saved_path; @@ -1206,14 +1200,10 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa else { switch (found) { case 'r': - load_iseq_eval(ec, path, &fls); + load_iseq_eval(ec, path); break; case 's': - if (fls.filev != Qfalse) { - rb_io_close(fls.filev); - fls.filev = Qfalse; - } reset_ext_config = true; ext_config_push(th, &prev_ext_config); handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext, @@ -2539,29 +2539,6 @@ rb_parser_load_file(VALUE parser, VALUE fname_v) return load_file(parser, fname_v, f, 0, &opt); } -void * -rb_parser_load_state(VALUE parser, VALUE fname_v, - struct ruby_file_load_state *fls) -{ - if (fls->filev != Qfalse) { - ruby_cmdline_options_t opt; - - cmdline_options_init(&opt); - /* TODO: xflag for DOSISH || __CYGWIN__ */ - if (fls->is_nonblock) { - struct rb_io_t *fptr; - - RB_IO_POINTER(fls->filev, fptr); - disable_nonblock(fptr->fd); - } - if (fls->is_fifo) { - rb_io_wait(fls->filev, RB_INT2NUM(RUBY_IO_READABLE), Qnil); - } - return load_file(parser, fname_v, fls->filev, 0, &opt); - } - return rb_parser_load_file(parser, fname_v); -} - /* * call-seq: * Process.argv0 -> frozen_string diff --git a/win32/file.c b/win32/file.c index 3132bf41a4..31cc1aff6e 100644 --- a/win32/file.c +++ b/win32/file.c @@ -10,7 +10,6 @@ #include <wchar.h> #include <shlwapi.h> #include "win32/file.h" -#include "internal/file.h" #ifndef INVALID_FILE_ATTRIBUTES # define INVALID_FILE_ATTRIBUTES ((DWORD)-1) @@ -593,9 +592,8 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na return result; } -/* TODO: using @fls is an exercise for a win32 hacker */ int -rb_file_load_ok(const char *path, struct ruby_file_load_state *fls) +rb_file_load_ok(const char *path) { DWORD attr; int ret = 1; |