diff --git a/src/bin/launcher/Makefile b/src/bin/launcher/Makefile index c0ea8e0..78193bd 100644 --- a/src/bin/launcher/Makefile +++ b/src/bin/launcher/Makefile @@ -6,7 +6,8 @@ include ../Makefile.inc INCLUDES += -I./include -I../../lib/views/sunlight/include -I../../lib/libcpp/include -I../../lib/objgfx40/objgfx40 -CFLAGS = -nostdlib -fno-exceptions +CFLAGS = -nostdlib -fno-exceptions -frtti +LIBRARIES += ../../lib/libstdc++/*.o #Linker LD = ld diff --git a/src/bin/shell/commands.c b/src/bin/shell/commands.c index ddfd2e5..f2f4dfb 100644 --- a/src/bin/shell/commands.c +++ b/src/bin/shell/commands.c @@ -47,15 +47,15 @@ else if (memcmp(data->args->arg,"stress", 6) == 0) { while (1) { cPid = fork(); - printf("Pid: [%i]\n",cPid); if (!cPid) { - exec("test",data->argc,data->argv); - exit(1); + printf("Pid: [%i]\n",cPid); + exec("clock",0x0,0x0); + exit(-1); } else { - while (pidStatus(cPid)); + while (pidStatus(cPid)) + sched_yield(); } - } } else if (memcmp(data->args->arg,"echo",4) == 0) { diff --git a/src/bin/ubistry/main.c b/src/bin/ubistry/main.c index 20fe226..1e3f02c 100644 --- a/src/bin/ubistry/main.c +++ b/src/bin/ubistry/main.c @@ -35,6 +35,7 @@ #include "./include/ubistry.h" int main(int argc,char **argv) { + FILE *pidFile; if (fork() != 0x0) { sched_yield(); @@ -56,6 +57,9 @@ /*** $Log$ + Revision 1.5 2004/06/01 01:30:43 reddawg + No more warnings and organized make files + Revision 1.4 2004/05/26 15:41:20 reddawg ubistry: added command 666 which will restart the registry server also added command 51 to add a key format key,value diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 2fd5b9b..426e6fb 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -1,27 +1,27 @@ /***************************************************************************************** - Copyright (c) 2002 The UbixOS Project + Copyright (c) 2002-2004 The UbixOS Project All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are -permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list of -conditions, the following disclaimer and the list of authors. Redistributions in binary -form must reproduce the above copyright notice, this list of conditions, the following -disclaimer and the list of authors in the documentation and/or other materials provided -with the distribution. Neither the name of the UbixOS Project nor the names of its -contributors may be used to endorse or promote products derived from this software -without specific prior written permission. + Redistributions of source code must retain the above copyright notice, this list of + conditions, the following disclaimer and the list of authors. Redistributions in binary + form must reproduce the above copyright notice, this list of conditions, the following + disclaimer and the list of authors in the documentation and/or other materials provided + with the distribution. Neither the name of the UbixOS Project nor the names of its + contributors may be used to endorse or promote products derived from this software + without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Id$ @@ -151,12 +151,12 @@ /* If We Dont Find the File Return */ if (!tmpFd) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + // kprintf("Exec Format Error: Binary File Not Executable.\n"); fclose(tmpFd); return; } if (tmpFd->perms == 0) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); fclose(tmpFd); return; } @@ -168,19 +168,19 @@ /* Check If App Is A Real Application */ if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); kfree(binaryHeader); fclose(tmpFd); return; } else if (binaryHeader->eType != 2) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); kfree(binaryHeader); fclose(tmpFd); return; } else if (binaryHeader->eEntry == 0x300000) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); kfree(binaryHeader); fclose(tmpFd); return; @@ -356,7 +356,7 @@ return; } if (tmpFd->perms == 0) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); fclose(tmpFd); return; } @@ -369,19 +369,19 @@ /* Check If App Is A Real Application */ if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); kfree(binaryHeader); fclose(tmpFd); return; } else if (binaryHeader->eType != 2) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); kfree(binaryHeader); fclose(tmpFd); return; } else if (binaryHeader->eEntry == 0x300000) { - kprintf("Exec Format Error: Binary File Not Executable.\n"); + //kprintf("Exec Format Error: Binary File Not Executable.\n"); kfree(binaryHeader); fclose(tmpFd); return; @@ -458,6 +458,12 @@ /*** $Log$ + Revision 1.15 2004/06/04 13:29:56 reddawg + libc: modified mkdir(); interface + kpanic: kPanic(); now says kPanic: %s + system: now reboots when receives message for reboot + also when command start sde is received by system the STD is started + Revision 1.14 2004/06/01 00:04:53 reddawg Try now mark diff --git a/src/sys/kernel/fork.c b/src/sys/kernel/fork.c index 995cd12..c34cb53 100644 --- a/src/sys/kernel/fork.c +++ b/src/sys/kernel/fork.c @@ -32,12 +32,6 @@ #include #include -int testF(struct taskStruct *newProcess) { - newProcess->uid = 0x0; - newProcess->tss.cr3 = (uInt32)vmmCopyVirtualSpace(newProcess->id); - return(newProcess->id); - } - /************************************************************************ Function: void sysFork(); @@ -109,6 +103,9 @@ /*** $Log$ + Revision 1.3 2004/05/19 14:32:06 reddawg + Cleaned up some warning from leaving out typedefs + Revision 1.2 2004/05/15 02:30:28 reddawg Lots of changes