From c2486d9180aba831f60cda9c3214512522e5e7ff Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Sat, 2 May 2020 10:02:49 -0700 Subject: [PATCH] 1. added missing return 2. Fixed error with pushing string from filewatcher --- microscript/ILibDuktape_ChildProcess.c | 1 + microscript/ILibDuktape_fs.c | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/microscript/ILibDuktape_ChildProcess.c b/microscript/ILibDuktape_ChildProcess.c index 3ec7203..1fe129d 100644 --- a/microscript/ILibDuktape_ChildProcess.c +++ b/microscript/ILibDuktape_ChildProcess.c @@ -123,6 +123,7 @@ void ILibDuktape_ChildProcess_SubProcess_ExitHandler(ILibProcessPipe_Process sen p->exitCode = exitCode; p->dispatchFlags = 1; Duktape_RunOnEventLoop(p->chain, duk_ctx_nonce(p->ctx), p->ctx, ILibDuktape_ChildProcess_SubProcess_ExitHandler_sink1, NULL, p); + return; } #endif diff --git a/microscript/ILibDuktape_fs.c b/microscript/ILibDuktape_fs.c index 1ea0b7b..529d842 100644 --- a/microscript/ILibDuktape_fs.c +++ b/microscript/ILibDuktape_fs.c @@ -965,7 +965,6 @@ void ILibDuktape_fs_watch_iocompletionEx(void *chain, void *user) ILibDuktape_fs_watcherData *data = (ILibDuktape_fs_watcherData*)user; FILE_NOTIFY_INFORMATION *n = (FILE_NOTIFY_INFORMATION*)data->results; char filename[4096]; - size_t filenameLen; int changed = 0, renamed = 0; @@ -974,37 +973,37 @@ void ILibDuktape_fs_watch_iocompletionEx(void *chain, void *user) while (n != NULL) { - filenameLen = ILibWideToUTF8_stupidEx(n->FileName, n->FileNameLength, filename, (int)sizeof(filename)); + ILibWideToUTF8_stupidEx(n->FileName, n->FileNameLength, filename, (int)sizeof(filename)); switch (n->Action) { case FILE_ACTION_RENAMED_OLD_NAME: - duk_push_lstring(data->ctx, filename, filenameLen-1); + duk_push_string(data->ctx, filename); duk_put_prop_string(data->ctx, -2, "oldname"); renamed = 1; break; case FILE_ACTION_RENAMED_NEW_NAME: - duk_push_lstring(data->ctx, filename, filenameLen - 1); + duk_push_string(data->ctx, filename); duk_put_prop_string(data->ctx, -2, "newname"); renamed = 1; break; case FILE_ACTION_ADDED: duk_push_string(data->ctx, "ADDED"); duk_put_prop_string(data->ctx, -2, "changeType"); - duk_push_lstring(data->ctx, filename, filenameLen - 1); + duk_push_string(data->ctx, filename); duk_put_prop_string(data->ctx, -2, "\xFF_FileName"); changed = 1; break; case FILE_ACTION_REMOVED: duk_push_string(data->ctx, "REMOVED"); duk_put_prop_string(data->ctx, -2, "changeType"); - duk_push_lstring(data->ctx, filename, filenameLen - 1); + duk_push_string(data->ctx, filename); duk_put_prop_string(data->ctx, -2, "\xFF_FileName"); changed = 1; break; case FILE_ACTION_MODIFIED: duk_push_string(data->ctx, "MODIFIED"); duk_put_prop_string(data->ctx, -2, "changeType"); - duk_push_lstring(data->ctx, filename, filenameLen - 1); + duk_push_string(data->ctx, filename); duk_put_prop_string(data->ctx, -2, "\xFF_FileName"); changed = 1; break;