Allow passing custom UVWASI init options (#273)

source/m3_api_uvwasi.c

@@ -17,8 +17,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "uvwasi.h"
-
 #ifndef d_m3EnableWasiTracing
 #  define d_m3EnableWasiTracing     0
 #endif
@@ -1026,8 +1024,6 @@ m3_wasi_context_t* m3_GetWasiContext()
 
 M3Result  m3_LinkWASI  (IM3Module module)
 {
-    M3Result result = m3Err_none;
-
     #define ENV_COUNT       9
 
     char* env[ENV_COUNT];
@@ -1056,6 +1052,13 @@ M3Result  m3_LinkWASI  (IM3Module module)
     init_options.preopenc = PREOPENS_COUNT;
     init_options.preopens = preopens;
 
+    return m3_LinkWASIWithOptions(module, init_options);
+}
+
+M3Result  m3_LinkWASIWithOptions  (IM3Module module, uvwasi_options_t init_options)
+{
+    M3Result result = m3Err_none;
+
     if (!wasi_context) {
         wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
         wasi_context->exit_code = 0;

source/m3_api_wasi.h

@@ -10,6 +10,10 @@
 
 #include "m3_core.h"
 
+#if defined(d_m3HasUVWASI)
+#include "uvwasi.h"
+#endif
+
 d_m3BeginExternC
 
 typedef struct m3_wasi_context_t
@@ -19,7 +23,13 @@ typedef struct m3_wasi_context_t
     ccstr_t *               argv;
 } m3_wasi_context_t;
 
-M3Result    m3_LinkWASI     (IM3Module io_module);
+M3Result    m3_LinkWASI             (IM3Module io_module);
+
+#if defined(d_m3HasUVWASI)
+
+M3Result    m3_LinkWASIWithOptions	(IM3Module io_module, uvwasi_options_t uvwasiOptions);
+
+#endif
 
 m3_wasi_context_t* m3_GetWasiContext();