Commit 75ff2fd19379e7aded9d661e16386a8a3b7dad92
2024-07-16T21:41:08
fix env_load __DIR__ and __FILE__
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/libkc3/env.c b/libkc3/env.c
index 9c2eaea..221cacb 100644
--- a/libkc3/env.c
+++ b/libkc3/env.c
@@ -2019,18 +2019,20 @@ s_env * env_init_args (s_env *env, int *argc, char ***argv)
s_env * env_init_globals (s_env *env)
{
+ s_tag file_dir;
+ s_tag file_path;
if (! frame_init(&env->global_frame, NULL))
return NULL;
- if (! tag_init_str(&env->file_dir, NULL, env->argv0_dir.size,
- env->argv0_dir.ptr.pchar))
+ file_dir.type = TAG_STR;
+ if (! file_pwd(&file_dir.data.str))
return NULL;
if (! frame_binding_new(&env->global_frame, &g_sym___DIR__,
- &env->file_dir))
+ &file_dir))
return NULL;
- if (! tag_init_str_1(&env->file_path, NULL, env->argv[0]))
+ if (! tag_init_str_1(&file_path, NULL, "stdin"))
return NULL;
if (! frame_binding_new(&env->global_frame, &g_sym___FILE__,
- &env->file_path))
+ &file_path))
return NULL;
return env;
}
@@ -2098,10 +2100,10 @@ s_tag * env_let (s_env *env, const s_tag *tag, const s_block *block,
bool env_load (s_env *env, const s_str *path)
{
s_buf buf;
- s_tag dir;
- s_tag env_file_dir;
- s_tag env_file_path;
- s_tag path_tag;
+ s_tag *file_dir;
+ s_tag file_dir_save;
+ s_tag *file_path;
+ s_tag file_path_save;
sw r;
s_tag tag = {0};
s_tag tmp;
@@ -2113,16 +2115,15 @@ bool env_load (s_env *env, const s_str *path)
buf_clean(&buf);
return false;
}
- dir.type = TAG_STR;
- if (! file_dirname(path, &dir.data.str)) {
+ file_dir = frame_get_w(&env->global_frame, &g_sym___DIR__);
+ file_dir_save = *file_dir;
+ file_path = frame_get_w(&env->global_frame, &g_sym___FILE__);
+ file_path_save = *file_path;
+ if (! file_dirname(path, &file_dir->data.str)) {
buf_clean(&buf);
return false;
}
- tag_init_str(&path_tag, NULL, path->size, path->ptr.pchar);
- env_file_dir = env->file_dir;
- env_file_path = env->file_path;
- env->file_dir = dir;
- env->file_path = path_tag;
+ tag_init_str(file_path, NULL, path->size, path->ptr.pchar);
while (1) {
if ((r = buf_parse_tag(&buf, &tag)) < 0) {
buf_getc_close(&buf);
@@ -2140,10 +2141,10 @@ bool env_load (s_env *env, const s_str *path)
tag_clean(&tmp);
tag_clean(&tag);
}
+ *file_dir = file_dir_save;
+ *file_path = file_path_save;
buf_getc_close(&buf);
buf_clean(&buf);
- env->file_dir = env_file_dir;
- env->file_path = env_file_path;
return true;
}
diff --git a/libkc3/file.c b/libkc3/file.c
index d2348d0..88d5b3e 100644
--- a/libkc3/file.c
+++ b/libkc3/file.c
@@ -162,6 +162,20 @@ FILE * file_open (const char *path, const char *mode)
return fp;
}
+s_str * file_pwd (s_str *dest)
+{
+ char buf[PATH_MAX];
+ char *pchar;
+ uw size;
+ if (! getcwd(buf, sizeof(buf)))
+ return NULL;
+ size = strlen(buf);
+ pchar = calloc(1, size + 1);
+ memcpy(pchar, buf, size);
+ str_init(dest, pchar, size, pchar);
+ return dest;
+}
+
s_str * file_search (const s_str *suffix, const s_sym *mode,
s_str *dest)
{
diff --git a/libkc3/file.h b/libkc3/file.h
index 1a87878..1bb1992 100644
--- a/libkc3/file.h
+++ b/libkc3/file.h
@@ -33,6 +33,7 @@ s_str * file_search (const s_str *suffix, const s_sym *mode,
s_str *dest);
/* Operators. */
-FILE * file_open (const char *path, const char *mode);
+s_str * file_pwd (s_str *dest);
+FILE * file_open (const char *path, const char *mode);
#endif /* LIBKC3_FILE_H */
diff --git a/libkc3/types.h b/libkc3/types.h
index 3c0910c..11076e4 100644
--- a/libkc3/types.h
+++ b/libkc3/types.h
@@ -652,8 +652,6 @@ struct env {
s_buf err;
s_error_handler *error_handler;
s_facts facts;
- s_tag file_dir;
- s_tag file_path;
s_frame *frame;
s_frame global_frame;
s_buf in;