Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use search path for image files

Browse source
This commit is contained in:
Alex Shinn 2016-03-13 15:25:42 +09:00
parent 22bfa48698
commit 4599766346
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gc_heap.c
View file

@ -574,9 +574,13 @@ char* sexp_load_image_err() {
return gc_heap_err_str; return gc_heap_err_str;
} }
static const char* all_paths[] = {sexp_default_module_path, sexp_default_user_module_path};
sexp sexp_load_image (const char* filename, off_t offset, sexp_uint_t heap_free_size, sexp_uint_t heap_max_size) { sexp sexp_load_image (const char* filename, off_t offset, sexp_uint_t heap_free_size, sexp_uint_t heap_max_size) {
struct load_image_state state; struct load_image_state state;
struct sexp_image_header_t header; struct sexp_image_header_t header;
const char *mod_path, *colon, *end;
char path[512];
FILE *fp; FILE *fp;
int i; int i;
sexp res = NULL, ctx = NULL, base, *ctx_globals, *ctx_types; sexp res = NULL, ctx = NULL, base, *ctx_globals, *ctx_types;
@ -586,6 +590,19 @@ sexp sexp_load_image (const char* filename, off_t offset, sexp_uint_t heap_free_
memset(&state, 0, sizeof(struct load_image_state)); memset(&state, 0, sizeof(struct load_image_state));
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
/* fallback to the default search path (can't use sexp_find_module_file */
/* since there's no context yet) */
for (i=0; !fp && i<sizeof(all_paths)/sizeof(all_paths[0]); ++i) {
for (mod_path=all_paths[i]; *mod_path; mod_path=colon+1) {
colon = strchr(mod_path, ':');
end = colon ? colon : mod_path + strlen(mod_path);
strncpy(path, mod_path, end-mod_path);
if (end[-1] != '/') path[end-mod_path] = '/';
strcpy(path + (end-mod_path) + (end[-1] == '/' ? 0 : 1), filename);
fp = fopen(path, "rb");
if (fp || !colon) break;
}
}
if (!fp) { if (!fp) {
snprintf(gc_heap_err_str, ERR_STR_SIZE, "couldn't open image file for reading: %s\n", filename); snprintf(gc_heap_err_str, ERR_STR_SIZE, "couldn't open image file for reading: %s\n", filename);
goto done; goto done;