updating WASI stdio handle initialization and build options for UVWASI

Author: lum1n0us

.github/workflows/compilation_on_android_ubuntu.yml

@@ -164,6 +164,7 @@ jobs:
             "-DWAMR_BUILD_MEMORY64=1",
             "-DWAMR_BUILD_MULTI_MEMORY=1",
             "-DWAMR_BUILD_SHARED=1",
+            "-DWAMR_BUILD_LIBC_UVWASI=1",
           ]
         os: [ubuntu-22.04]
         platform: [android, linux]

core/iwasm/aot/aot_loader.c

@@ -4127,10 +4127,14 @@ create_module(char *name, char *error_buf, uint32 error_buf_size)
     }
 #endif
 
-#if WASM_ENABLE_LIBC_WASI != 0
+#if WASM_ENABLE_UVWASI == 0
     module->wasi_args.stdio[0] = os_invalid_raw_handle();
     module->wasi_args.stdio[1] = os_invalid_raw_handle();
     module->wasi_args.stdio[2] = os_invalid_raw_handle();
+#else
+    module->wasi_args.stdio[0] = os_get_invalid_handle();
+    module->wasi_args.stdio[1] = os_get_invalid_handle();
+    module->wasi_args.stdio[2] = os_get_invalid_handle();
 #endif
 
     return module;

core/iwasm/common/wasm_runtime_common.c

@@ -3877,11 +3877,15 @@ wasm_runtime_init_wasi(WASMModuleInstanceCommon *module_inst,
     init_options.allocator = &uvwasi_allocator;
     init_options.argc = argc;
     init_options.argv = (const char **)argv;
-    init_options.in = (stdinfd != -1) ? (uvwasi_fd_t)stdinfd : init_options.in;
-    init_options.out =
-        (stdoutfd != -1) ? (uvwasi_fd_t)stdoutfd : init_options.out;
-    init_options.err =
-        (stderrfd != -1) ? (uvwasi_fd_t)stderrfd : init_options.err;
+    init_options.in = (stdinfd != os_get_invalid_handle())
+                          ? (uvwasi_fd_t)stdinfd
+                          : init_options.in;
+    init_options.out = (stdoutfd != os_get_invalid_handle())
+                           ? (uvwasi_fd_t)stdoutfd
+                           : init_options.out;
+    init_options.err = (stderrfd != os_get_invalid_handle())
+                           ? (uvwasi_fd_t)stderrfd
+                           : init_options.err;
 
     if (dir_count > 0) {
         init_options.preopenc = dir_count;

core/iwasm/interpreter/wasm_loader.c

@@ -6376,10 +6376,14 @@ create_module(char *name, char *error_buf, uint32 error_buf_size)
     }
 #endif
 
-#if WASM_ENABLE_LIBC_WASI != 0
+#if WASM_ENABLE_UVWASI == 0
     module->wasi_args.stdio[0] = os_invalid_raw_handle();
     module->wasi_args.stdio[1] = os_invalid_raw_handle();
     module->wasi_args.stdio[2] = os_invalid_raw_handle();
+#else
+    module->wasi_args.stdio[0] = os_get_invalid_handle();
+    module->wasi_args.stdio[1] = os_get_invalid_handle();
+    module->wasi_args.stdio[2] = os_get_invalid_handle();
 #endif
 
     (void)ret;

core/iwasm/interpreter/wasm_mini_loader.c

@@ -3137,10 +3137,14 @@ create_module(char *name, char *error_buf, uint32 error_buf_size)
     }
 #endif
 
-#if WASM_ENABLE_LIBC_WASI != 0
+#if WASM_ENABLE_LIBC_UVWASI == 0
     module->wasi_args.stdio[0] = os_invalid_raw_handle();
     module->wasi_args.stdio[1] = os_invalid_raw_handle();
     module->wasi_args.stdio[2] = os_invalid_raw_handle();
+#else
+    module->wasi_args.stdio[0] = os_get_invalid_handle();
+    module->wasi_args.stdio[1] = os_get_invalid_handle();
+    module->wasi_args.stdio[2] = os_get_invalid_handle();
 #endif
 
     (void)ret;