4 files changed, 50 insertions, 13 deletions

diff --git a/sys/kern/exec_elf64.c b/sys/kern/exec_elf64.c
index 3767b0b..987dda4 100644
--- a/sys/kern/exec_elf64.c
+++ b/sys/kern/exec_elf64.c
@@ -192,6 +192,7 @@ elf64_load(const char *pathname, struct proc *td, struct exec_prog *prog)
     if ((status = elf64_verify(hdr)) != 0)
         goto done;
 
+    memset(loadmap, 0, sizeof(loadmap));
     pcbp = &td->pcb;
     start = -1;
     end = 0;
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index b760912..2a53b8a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -101,7 +101,7 @@ execve(struct proc *td, const struct execve_args *args)
     stack_top = td->stack_base + (PROC_STACK_SIZE - 1);
 
     /* Setup registers, signals and stack */
-    md_td_stackinit(td, (void *)(stack_top + VM_HIGHER_HALF), &prog);
+    stack_top = md_td_stackinit(td, (void *)(stack_top + VM_HIGHER_HALF), &prog);
     setregs(td, &prog, stack_top);
     signals_init(td);
 
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 6afae81..2f9e344 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -137,6 +137,10 @@ exit1(struct proc *td, int flags)
         proc_reap(td);
     }
 
+    if (td->data != NULL) {
+        dynfree(td->data);
+    }
+
     /*
      * Only free the process structure if we aren't
      * being waited on, otherwise let it be so the
@@ -157,8 +161,6 @@ exit1(struct proc *td, int flags)
         ci->curtd = NULL;
         if (parent->pid == 0)
             sched_enter();
-        if (td->data == NULL)
-            sched_enter();
 
         parent->flags &= ~PROC_SLEEP;
         sched_enter();
@@ -175,7 +177,6 @@ sys_exit(struct syscall_args *scargs)
 {
     struct proc *td = this_td();
 
-    td->data = scargs->tf;
     td->exit_status = scargs->arg0;
     exit1(td, 0);
     __builtin_unreachable();
diff --git a/sys/kern/kern_spawn.c b/sys/kern/kern_spawn.c
index 60d8e22..a953a6e 100644
--- a/sys/kern/kern_spawn.c
+++ b/sys/kern/kern_spawn.c
@@ -45,10 +45,17 @@
 #define pr_trace(fmt, ...) kprintf("spawn: " fmt, ##__VA_ARGS__)
 #define pr_error(...) pr_trace(__VA_ARGS__)
 
+#define ARGVP_MAX (ARG_MAX / sizeof(void *))
+
 static volatile size_t nthreads = 0;
 
+/*
+ * TODO: envp
+ */
 struct spawn_args {
     char path[PATH_MAX];
+    char argv_blk[ARG_MAX];
+    char *argv[ARGVP_MAX];
 };
 
 static inline void
@@ -67,7 +74,6 @@ spawn_thunk(void)
     struct proc *cur;
     struct execve_args execve_args;
     struct spawn_args *args;
-    char *argv[] = { NULL, NULL };
     char *envp[] = { NULL };
 
     cur = this_td();
@@ -76,13 +82,10 @@ spawn_thunk(void)
     memset(pathbuf, 0, sizeof(pathbuf));
     memcpy(pathbuf, path, strlen(path));
 
-    argv[0] = (char *)pathbuf;
-    execve_args.pathname = argv[0];
-    execve_args.argv = argv;
+    execve_args.pathname = pathbuf;
+    execve_args.argv = (char **)&args->argv[0];
     execve_args.envp = envp;
-
     path = NULL;
-    dynfree(args);
 
     if (execve(cur, &execve_args) != 0) {
         pr_error("execve failed, aborting\n");
@@ -211,19 +214,26 @@ get_child(struct proc *cur, pid_t pid)
 
 /*
  * arg0: The file /path/to/executable
- * arg1: Optional flags (`flags')
+ * arg1: Argv
+ * arg2: Envp (TODO)
+ * arg3: Optional flags (`flags')
  */
 scret_t
 sys_spawn(struct syscall_args *scargs)
 {
     struct spawn_args *args;
-    const char *u_path;
+    char *path;
+    const char *u_path, **u_argv;
+    const char *u_p = NULL;
     struct proc *td;
     int flags, error;
+    size_t len, bytes_copied = 0;
+    size_t argv_i = 0;
 
     td = this_td();
-    flags = scargs->arg1;
     u_path = (const char *)scargs->arg0;
+    u_argv = (const char **)scargs->arg1;
+    flags = scargs->arg3;
 
     args = dynalloc(sizeof(*args));
     if (args == NULL) {
@@ -236,5 +246,30 @@ sys_spawn(struct syscall_args *scargs)
         return error;
     }
 
+    memset(args->argv, 0, ARG_MAX);
+    for (size_t i = 0; i < ARG_MAX - 1; ++i) {
+        error = copyin(&u_argv[argv_i], &u_p, sizeof(u_p));
+        if (error < 0) {
+            dynfree(args);
+            return error;
+        }
+        if (u_p == NULL) {
+            args->argv[argv_i++] = NULL;
+            break;
+        }
+
+        path = &args->argv_blk[i];
+        error = copyinstr(u_p, path, ARG_MAX - bytes_copied);
+        if (error < 0) {
+            dynfree(args);
+            return error;
+        }
+
+        args->argv[argv_i++] = &args->argv_blk[i];
+        len = strlen(path);
+        bytes_copied += (len + 1);
+        i += len;
+    }
+
     return spawn(td, spawn_thunk, args, flags, NULL);
 }