weenix fixes

1 files changed, 17 insertions, 3 deletions

diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c
index f13064a..2ade163 100644
--- a/kernel/proc/proc.c
+++ b/kernel/proc/proc.c
@@ -223,9 +223,6 @@ proc_t *proc_create(const char *name)
         proc_initproc = proc;
     } 
 
-    proc->p_vmmap = vmmap_clone(curproc->p_vmmap);
-    curproc->p_vmmap->vmm_proc = proc;
-
 #ifdef __VFS__
     // clone and ref the files from curproc
     for (int fd = 0; fd < NFILES; fd++)
@@ -243,6 +240,23 @@ proc_t *proc_create(const char *name)
     }
 #endif
 
+#ifdef __VM__
+    proc->p_vmmap = vmmap_clone(curproc->p_vmmap);
+    curproc->p_vmmap->vmm_proc = proc;
+
+    KASSERT(proc->p_vmmap != NULL); //FIXME!
+
+    // copy the table of file descriptors
+    for (int i = 0; i < NFILES; i++)
+    {
+        if (curproc->p_files[i] != NULL)
+        {
+            fref(curproc->p_files[i]);
+            proc->p_files[i] = curproc->p_files[i];
+        }
+    }
+#endif
+
     return proc;
 }