summaryrefslogtreecommitdiff
path: root/mini_builtin.c
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2019-11-09 07:09:01 +0900
committerKoichi Sasada <ko1@atdot.net>2019-11-09 07:09:01 +0900
commitb5d884922053962c955df1ce54d9dabc98888272 (patch)
tree219cedfe41e47690e474922d166c64ab8e2b2550 /mini_builtin.c
parentdfac2e9eb3d697e56d91151584f1d3cf9d2c79c9 (diff)
Revert "don't embed full-path."
This reverts commit dfac2e9eb3d697e56d91151584f1d3cf9d2c79c9. It does not work if cwd is different from builddir...
Diffstat (limited to 'mini_builtin.c')
-rw-r--r--mini_builtin.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/mini_builtin.c b/mini_builtin.c
index 060c955fcb..dc95919da2 100644
--- a/mini_builtin.c
+++ b/mini_builtin.c
@@ -36,23 +36,12 @@ read_file(const char *fname, size_t *psize)
}
static struct st_table *loaded_builtin_table;
-static char srcdir[0x200];
-static const char fname[] = "mini_builtin.c";
-
-static const char *
-feature_path(const char *name)
-{
- static char path[0x200];
- snprintf(path, 0x200-1, "%s%s.rb", srcdir, name);
- // fprintf(stderr, "srcdir:%s, path:%s, PATH_SEP_CHAR:%c\n", srcdir, path, PATH_SEP_CHAR);
- return path;
-}
void
-rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
+rb_load_with_builtin_functions(const char *feature_name, const char *fname, const struct rb_builtin_function *table)
{
size_t fsize;
- const char *code = read_file(feature_path(feature_name), &fsize);
+ const char *code = read_file(fname, &fsize);
VALUE code_str = rb_utf8_str_new_static(code, fsize);
VALUE name_str = rb_sprintf("<internal:%s>", feature_name);
rb_obj_hide(code_str);
@@ -97,15 +86,4 @@ Init_builtin(void)
{
rb_define_singleton_method(rb_cRubyVM, "each_builtin", each_builtin, 0);
loaded_builtin_table = st_init_strtable();
-
- // check srcdir
- // assume __FILE__ encoding is ASCII compatible.
- int pos = strlen(__FILE__) - strlen(fname);
- if (pos < 0) rb_bug("strlen(%s) - strlen(%s) < 0", __FILE__, fname);
-
- if (strcmp(__FILE__ + pos, fname) != 0) {
- rb_bug("%s does not terminate with %s\n", __FILE__, fname);
- }
- strncpy(srcdir, __FILE__, 0x200-1);
- srcdir[pos] = 0;
}