Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / kernel / process / process.c

diff --git a/lunaix-os/kernel/process/process.c b/lunaix-os/kernel/process/process.c
index e30e46120a21b4e213c4087d10f158cc7352ca99..8df3f2c9ef8090422000c7dbf60116220730ccbe 100644 (file)
--- a/lunaix-os/kernel/process/process.c
+++ b/lunaix-os/kernel/process/process.c
@@ -123,7 +123,7 @@ __DEFINE_LXSYSCALL2(int, setpgid, pid_t, pid, pid_t, pgid)
 
     struct proc_info* gruppenfuhrer = get_process(pgid);
 
 
     struct proc_info* gruppenfuhrer = get_process(pgid);
 

-    if (!gruppenfuhrer || proc->pgid == proc->pid) {
+    if (!gruppenfuhrer || proc->pgid == gruppenfuhrer->pid) {

         __current->k_status = EINVAL;
         return -1;
     }
         __current->k_status = EINVAL;
         return -1;
     }


@@ -196,6 +196,13 @@ dup_proc()
     pcb->intr_ctx = __current->intr_ctx;
     pcb->parent = __current;
 
     pcb->intr_ctx = __current->intr_ctx;
     pcb->parent = __current;
 

+    memcpy(pcb->fxstate, __current->fxstate, 512);
+
+    if (__current->cwd) {
+        pcb->cwd = __current->cwd;
+        vfs_ref_dnode(pcb->cwd);
+    }
+

     __copy_fdtable(pcb);
     region_copy(&__current->mm.regions, &pcb->mm.regions);
 
     __copy_fdtable(pcb);
     region_copy(&__current->mm.regions, &pcb->mm.regions);
 


@@ -204,7 +211,7 @@ dup_proc()
     // 根据 mm_region 进一步配置页表
 
     struct mm_region *pos, *n;
     // 根据 mm_region 进一步配置页表
 
     struct mm_region *pos, *n;

-    llist_for_each(pos, n, &pcb->mm.regions.head, head)
+    llist_for_each(pos, n, &pcb->mm.regions, head)

     {
         // 如果写共享，则不作处理。
         if ((pos->attr & REGION_WSHARED)) {
     {
         // 如果写共享，则不作处理。
         if ((pos->attr & REGION_WSHARED)) {