diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h index 04d8a33..5559f7f 100644 --- a/src/sys/include/ubixos/sched.h +++ b/src/sys/include/ubixos/sched.h @@ -47,7 +47,7 @@ uInt32 stdinSize; uInt32 controlKeys; char *stdin; - char *cwd; /* current working dir */ + char cwd[1024]; /* current working dir */ }; typedef struct taskStruct { @@ -86,6 +86,9 @@ /*** $Log$ + Revision 1.29 2004/09/08 23:19:58 reddawg + hmm + Revision 1.28 2004/09/08 22:16:02 reddawg Fixens diff --git a/src/sys/kernel/fork.c b/src/sys/kernel/fork.c index 21746f5..3f5d3cc 100644 --- a/src/sys/kernel/fork.c +++ b/src/sys/kernel/fork.c @@ -52,8 +52,9 @@ assert(_current); /* Set Up New Tasks Information */ + memcpy(newProcess->oInfo.cwd,_current->oInfo.cwd,1024); + newProcess->tss.eip = eip; - sprintf(newProcess->oInfo.cwd,_current->oInfo.cwd); newProcess->oInfo.vmStart = _current->oInfo.vmStart; newProcess->term = _current->term; newProcess->term->owner = newProcess->id; @@ -127,5 +128,8 @@ /*** $Log$ + Revision 1.34 2004/09/11 13:06:39 reddawg + fork: cleaned up comments in fork and made fork_copyProcess static + END ***/ diff --git a/src/sys/kernel/sched.c b/src/sys/kernel/sched.c index 7fcb74b..c67a9fe 100644 --- a/src/sys/kernel/sched.c +++ b/src/sys/kernel/sched.c @@ -147,8 +147,6 @@ tmpTask->id = nextID++; tmpTask->state = NEW; - tmpTask->oInfo.cwd = (char *)kmalloc(1024); - spinLock(&schedulerSpinLock); tmpTask->next = taskList; @@ -278,6 +276,9 @@ /*** $Log$ + Revision 1.59 2004/09/11 22:17:52 reddawg + hmm.. + Revision 1.58 2004/09/11 21:45:44 reddawg Fixed sched to work with gcc 3.3 diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c index ae26429..b267d1d 100644 --- a/src/sys/kernel/systemtask.c +++ b/src/sys/kernel/systemtask.c @@ -101,9 +101,7 @@ if (tmpTask->imageFd != 0x0) fclose(tmpTask->imageFd); - - if (tmpTask->oInfo.cwd != 0x0) - kfree(tmpTask->oInfo.cwd); + kfree(tmpTask); } @@ -115,6 +113,9 @@ /*** $Log$ + Revision 1.24 2004/09/11 22:17:52 reddawg + hmm.. + Revision 1.23 2004/09/11 21:38:00 reddawg Fixed a few problems