Merge in mingw changes.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3873 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
2022-05-16 22:30:14 +00:00
parent 87224d2bb6
commit 7848b5e560
12 changed files with 188 additions and 50 deletions

View File

@ -33,6 +33,13 @@ typedef struct file_stat_t {
uv_fs_t _request;
} file_stat_t;
typedef struct fs_req_t {
uv_fs_t fs;
uv_file file;
size_t size;
char buffer[];
} fs_req_t;
void tf_file_register(JSContext* context)
{
JSValue global = JS_GetGlobalObject(context);
@ -59,6 +66,7 @@ static void _file_async_close_callback(uv_fs_t* req)
static void _file_read_read_callback(uv_fs_t* req)
{
uv_fs_req_cleanup(req);
fs_req_t* fsreq = (fs_req_t*)req;
tf_task_t* task = req->loop->data;
JSContext* context = tf_task_get_context(task);
promiseid_t promise = (promiseid_t)(intptr_t)req->data;
@ -78,7 +86,7 @@ static void _file_read_read_callback(uv_fs_t* req)
{
tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, uv_strerror(req->result)));
}
int result = uv_fs_close(req->loop, req, req->file, _file_async_close_callback);
int result = uv_fs_close(req->loop, req, fsreq->file, _file_async_close_callback);
if (result < 0)
{
free(req);
@ -116,12 +124,15 @@ static JSValue _file_read_file(JSContext* context, JSValueConst this_val, int ar
promiseid_t promise = -1;
JSValue promise_value = tf_task_allocate_promise(task, &promise);
uv_fs_t* req = malloc(sizeof(uv_fs_t) + k_file_read_max);
*req = (uv_fs_t)
fs_req_t* req = malloc(sizeof(fs_req_t) + k_file_read_max);
*req = (fs_req_t)
{
.data = (void*)(intptr_t)promise,
.fs =
{
.data = (void*)(intptr_t)promise,
},
};
int result = uv_fs_open(tf_task_get_loop(task), req, file_name, UV_FS_O_RDONLY, 0, _file_read_open_callback);
int result = uv_fs_open(tf_task_get_loop(task), &req->fs, file_name, UV_FS_O_RDONLY, 0, _file_read_open_callback);
if (result < 0)
{
tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, uv_strerror(result)));
@ -134,6 +145,7 @@ static JSValue _file_read_file(JSContext* context, JSValueConst this_val, int ar
static void _file_write_write_callback(uv_fs_t* req)
{
uv_fs_req_cleanup(req);
fs_req_t* fsreq = (fs_req_t*)req;
tf_task_t* task = req->loop->data;
JSContext* context = tf_task_get_context(task);
promiseid_t promise = (promiseid_t)(intptr_t)req->data;
@ -145,7 +157,7 @@ static void _file_write_write_callback(uv_fs_t* req)
{
tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, uv_strerror(req->result)));
}
uv_fs_close(req->loop, req, req->file, _file_async_close_callback);
uv_fs_close(req->loop, req, fsreq->file, _file_async_close_callback);
}
static void _file_write_open_callback(uv_fs_t* req)
@ -193,19 +205,22 @@ static JSValue _file_write_file(JSContext* context, JSValueConst this_val, int a
promiseid_t promise = -1;
JSValue promise_value = tf_task_allocate_promise(task, &promise);
uv_fs_t* req = malloc(sizeof(uv_fs_t) + sizeof(size_t) + size);
*req = (uv_fs_t)
fs_req_t* req = malloc(sizeof(fs_req_t) + size);
*req = (fs_req_t)
{
.data = (void*)(intptr_t)promise,
.fs =
{
.data = (void*)(intptr_t)promise,
},
.size = size,
};
memcpy(req + 1, &size, sizeof(size_t));
memcpy((char*)(req + 1) + sizeof(size_t), buffer, size);
memcpy(req->buffer, buffer, size);
if (!is_array_buffer)
{
JS_FreeCString(context, (const char*)buffer);
}
int result = uv_fs_open(tf_task_get_loop(task), req, file_name, UV_FS_O_CREAT | UV_FS_O_WRONLY, 0644, _file_write_open_callback);
int result = uv_fs_open(tf_task_get_loop(task), &req->fs, file_name, UV_FS_O_CREAT | UV_FS_O_WRONLY, 0644, _file_write_open_callback);
if (result < 0)
{
tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, uv_strerror(result)));