Address review comments and fix refactoring goof

Author: acfoltzer

basics/libc/crt1.c

@@ -2,18 +2,18 @@
 #include <sysexits.h>
 #include <wasi/core.h>
 
-extern char **environ;
+extern char **__environ;
 extern void __wasm_call_ctors(void);
 extern int main(int, char *[]);
 extern void __prepare_for_exit(void);
 void _Exit(int) __attribute__((noreturn));
 
-static __wasi_errno_t populate_args(size_t *argc, char **argv) {
+static __wasi_errno_t populate_args(size_t *argc, char ***argv) {
     __wasi_errno_t err;
 
     /* Get the sizes of the arrays we'll have to create to copy in the args. */
-    size_t argv_size;
-    err = __wasi_arg_sizes_get(argc, &argv_size);
+    size_t argv_buf_size;
+    err = __wasi_args_sizes_get(argc, &argv_buf_size);
     if (err != __WASI_ESUCCESS) {
         return err;
     }
@@ -22,43 +22,46 @@ static __wasi_errno_t populate_args(size_t *argc, char **argv) {
     }
 
     /* Allocate memory for the array of pointers. */
-    argv = malloc(sizeof(char *) * *argc);
+    *argv = malloc(sizeof(char *) * *argc);
     /* Allocate memory for storing the argument chars. */
-    char *argv_buf = malloc(sizeof(char) * argv_size);
-    if (argv == NULL || argv_buf == NULL) {
+    char *argv_buf = malloc(sizeof(char) * argv_buf_size);
+    if (*argv == NULL || argv_buf == NULL) {
         return __WASI_ENOMEM;
     }
 
     /* Fill the argument chars, and the argv array with pointers into those chars. */
-    return __wasi_argv_get(argv, argv_buf);
+    return __wasi_args_get(*argv, argv_buf);
 }
 
 static __wasi_errno_t populate_environ() {
     __wasi_errno_t err;
 
     /* Get the sizes of the arrays we'll have to create to copy in the environment. */
     size_t environ_count;
-    size_t environ_size;
-    err = __wasi_environ_sizes_get(&environ_count, &environ_size);
+    size_t environ_buf_size;
+    err = __wasi_environ_sizes_get(&environ_count, &environ_buf_size);
     if (err != __WASI_ESUCCESS) {
         return err;
     }
     /* If there's no environment pairs, make sure environ is null and return. */
     if (environ_count == 0) {
-        environ = NULL;
+        __environ = NULL;
         return __WASI_ESUCCESS;
     }
 
     /* Allocate memory for the array of pointers, plus one terminating null pointer. */
-    environ = malloc(sizeof(char *) * (environ_count + 1));
+    __environ = malloc(sizeof(char *) * (environ_count + 1));
     /* Allocate memory for storing the environment chars. */
-    char *environ_buf = malloc(sizeof(char) * environ_size);
-    if (environ == NULL || environ_buf == NULL) {
+    char *environ_buf = malloc(sizeof(char) * environ_buf_size);
+    if (__environ == NULL || environ_buf == NULL) {
         return __WASI_ENOMEM;
     }
 
+    /* Make sure the last pointer in the array is NULL. */
+    __environ[environ_count] = NULL;
+
     /* Fill the environment chars, and the __environ array with pointers into those chars. */
-    return __wasi_environ_get(environ, environ_buf);
+    return __wasi_environ_get(__environ, environ_buf);
 }
 
 void _start(void) {
@@ -73,7 +76,7 @@ void _start(void) {
     /* Fill in the arguments from WASI syscalls. */
     size_t argc;
     char **argv;
-    if (populate_args(&argc, argv) != __WASI_ESUCCESS) {
+    if (populate_args(&argc, &argv) != __WASI_ESUCCESS) {
         _Exit(EX_OSERR);
     }
 

expected/wasm32-wasi/undefined-symbols.txt

@@ -23,8 +23,8 @@ __subtf3
 __trunctfdf2
 __trunctfsf2
 __unordtf2
-__wasi_arg_sizes_get
-__wasi_argv_get
+__wasi_args_get
+__wasi_args_sizes_get
 __wasi_clock_res_get
 __wasi_clock_time_get
 __wasi_environ_get

libc-bottom-half/headers/public/wasi/core.h

@@ -426,15 +426,15 @@ _Static_assert(_Alignof(__wasi_subscription_t) == 8, "non-wasi data layout");
 #define __WASI_SYSCALL_NAME(name) \
     __attribute__((__import_module__("wasi_unstable"), __import_name__(#name)))
 
-__wasi_errno_t __wasi_arg_sizes_get(
-    size_t *argc,
-    size_t *argv_size
-) __WASI_SYSCALL_NAME(arg_sizes_get) __attribute__((__warn_unused_result__));
-
-__wasi_errno_t __wasi_argv_get(
+__wasi_errno_t __wasi_args_get(
     char **argv,
     char *argv_buf
-) __WASI_SYSCALL_NAME(argv_get) __attribute__((__warn_unused_result__));
+) __WASI_SYSCALL_NAME(args_get) __attribute__((__warn_unused_result__));
+
+__wasi_errno_t __wasi_args_sizes_get(
+    size_t *argc,
+    size_t *argv_buf_size
+) __WASI_SYSCALL_NAME(args_sizes_get) __attribute__((__warn_unused_result__));
 
 __wasi_errno_t __wasi_clock_res_get(
     __wasi_clockid_t clock_id,
@@ -454,7 +454,7 @@ __wasi_errno_t __wasi_environ_get(
 
 __wasi_errno_t __wasi_environ_sizes_get(
     size_t *environ_count,
-    size_t *environ_size
+    size_t *environ_buf_size
 ) __WASI_SYSCALL_NAME(environ_sizes_get) __attribute__((__warn_unused_result__));
 
 __wasi_errno_t __wasi_fd_close(