diff --git a/src/bin/cat/cat b/src/bin/cat/cat index bf8b937..240c95e 100755 --- a/src/bin/cat/cat +++ b/src/bin/cat/cat Binary files differ diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 653ed68..6a954a8 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -111,9 +111,9 @@ /* New Root Mount Point */ //Old 2 new 10 - #ifdef DEBUG - kprintf("[0xX][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n",B_ADAPTOR(rootdev),B_CONTROLLER(rootdev),B_SLICE(rootdev),B_UNIT(rootdev),B_PARTITION(rootdev),B_TYPE(rootdev)); - #endif + //#ifdef DEBUG + kprintf("[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n",B_ADAPTOR(rootdev),B_CONTROLLER(rootdev),B_SLICE(rootdev),B_UNIT(rootdev),B_PARTITION(rootdev),B_TYPE(rootdev)); + //#endif if (vfs_mount(0x1,B_PARTITION(rootdev)+2,0x0,0xAA,"sys","rw") != 0x0) { kprintf("Problem Mounting sys Mount Point\n"); } diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 2e9409a..0a395e4 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -371,8 +371,14 @@ elfDynamic *elfDynamicS = 0x0; struct i386_frame *iFrame = 0x0; + /* Need to rewrite this routine? */ tmpFd = (struct fileDescriptorStruct *)kmalloc(sizeof(struct fileDescriptorStruct)); - fopen(tmpFd,file,"r"); + if (fopen(tmpFd,file,"r") == 0x0) { + //kprintf("[0x%X]\n",tmpFd); + //kfree(tmpFd); //We need this but it's being done in fopen right now + return(0x0); + _current->imageFd = 0x0; + } _current->imageFd = tmpFd; /* If We Dont Find the File Return */ if (tmpFd == 0x0) { diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c index 1066cfe..c647742 100644 --- a/src/sys/kernel/systemtask.c +++ b/src/sys/kernel/systemtask.c @@ -105,7 +105,8 @@ */ tmpTask = sched_getDelTask(); if (tmpTask != 0x0) { - if ((tmpTask->imageFd != 0x0) || (tmpTask->imageFd != 0xBEBEBEBE)) { + if (tmpTask->imageFd != 0x0) { + kprintf("Closing: [0x%X]\n",tmpTask->imageFd); fclose(tmpTask->imageFd); } vmmFreeProcessPages(tmpTask->id); diff --git a/src/sys/vfs/vfs_syscalls.c b/src/sys/vfs/vfs_syscalls.c index 962d37a..7d3d64d 100644 --- a/src/sys/vfs/vfs_syscalls.c +++ b/src/sys/vfs/vfs_syscalls.c @@ -209,7 +209,8 @@ #ifdef VFSDEBUG kprintf("[0x%X]-234\n",nfp->buffer); #endif - fopen(nfp,uap->path,"r"); + //fopen(nfp,uap->path,"r"); + kprintf("[0x%X]\n",fopen(nfp,uap->path,"r")); #ifdef VFSDEBUG kprintf("[0x%X]-sdf\n",nfp->buffer); #endif diff --git a/src/tools/Makefile b/src/tools/Makefile index 03c9a37..02dd070 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -37,7 +37,7 @@ $(REMOVE) $(OBJS) $(BINARY) *.core install-ubix: - (cp ../sys/compile/ubix.elf /mnts/ubix/boot/loader) + (cp ../sys/compile/ubix.elf /mnts/ubix/boot/kernel/kernel) (cp ../bin/init/init /mnts/ubix/bin) (cp ../bin/login/login /mnts/ubix/bin) (cp ../bin/shell/shell /mnts/ubix/bin)