1 files changed, 72 insertions, 13 deletions

diff --git a/sys/kern/kern_spawn.c b/sys/kern/kern_spawn.c
index cb898dc..a953a6e 100644
--- a/sys/kern/kern_spawn.c
+++ b/sys/kern/kern_spawn.c
@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/spawn.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/mman.h>
@@ -44,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
@@ -66,25 +74,22 @@ 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();
-    args = cur->spawn_data;
+    args = cur->data;
     path = args->path;
+    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");
-        exit1(this_td());
+        exit1(this_td(), 0);
     }
     __builtin_unreachable();
 }
@@ -110,6 +115,7 @@ spawn(struct proc *cur, void(*func)(void), void *p, int flags, struct proc **new
     struct proc *newproc;
     struct mmap_lgdr *mlgdr;
     int error;
+    pid_t pid;
 
     newproc = dynalloc(sizeof(*newproc));
     if (newproc == NULL) {
@@ -150,17 +156,38 @@ spawn(struct proc *cur, void(*func)(void), void *p, int flags, struct proc **new
     TAILQ_INSERT_TAIL(&cur->leafq, newproc, leaf_link);
     atomic_inc_int(&cur->nleaves);
     newproc->parent = cur;
-    newproc->spawn_data = p;
+    newproc->data = p;
+    newproc->exit_status = -1;
 
     /* Initialize the mmap ledger */
     mlgdr->nbytes = 0;
     RBT_INIT(lgdr_entries, &mlgdr->hd);
     newproc->mlgdr = mlgdr;
+    newproc->flags |= PROC_WAITED;
 
     newproc->pid = ++nthreads;
     signals_init(newproc);
     sched_enqueue_td(newproc);
-    return newproc->pid;
+    pid = newproc->pid;
+
+    if (ISSET(flags, SPAWN_WAIT)) {
+        cur->flags |= PROC_SLEEP;
+
+        while (ISSET(cur->flags, PROC_SLEEP)) {
+            sched_yield();
+        }
+        while (!ISSET(newproc->flags, PROC_ZOMB)) {
+            sched_yield();
+        }
+
+        if (newproc->exit_status < 0) {
+            pid = newproc->exit_status;
+        }
+
+        proc_reap(newproc);
+    }
+
+    return pid;
 }
 
 /*
@@ -187,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) {
@@ -212,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);
 }