diff --git a/src/bin/launcher/Makefile b/src/bin/launcher/Makefile index 516d176..3bd4afb 100644 --- a/src/bin/launcher/Makefile +++ b/src/bin/launcher/Makefile @@ -32,7 +32,7 @@ # Link The Binary $(BINARY) : $(OBJS) $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(LIBRARIES2) $(OBJS) - #strip $(BINARY) + strip $(BINARY) # Compile the source files .cpp.o: diff --git a/src/lib/libstdc++/std/straights.h b/src/lib/libstdc++/std/straights.h index 225a9b4..2b81dbd 100644 --- a/src/lib/libstdc++/std/straights.h +++ b/src/lib/libstdc++/std/straights.h @@ -1,9 +1,5 @@ -extern "C" { - #include - } - typedef char charT; - +typedef int size_t; extern "C++" { diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 5d85160..e0f4c02 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -351,6 +351,7 @@ /* If We Dont Find the File Return */ if (tmpFd == 0x0) { + kprintf("Couldn't open file %s\n",file); return; } if (tmpFd->perms == 0) { @@ -456,6 +457,9 @@ /*** $Log$ + Revision 1.13 2004/05/25 22:44:08 reddawg + Removed debug code + Revision 1.12 2004/05/22 21:46:37 reddawg Fixed some bugs diff --git a/src/sys/ubixfs/ubixfs.c b/src/sys/ubixfs/ubixfs.c index 7ba4bf4..17ca4ff 100644 --- a/src/sys/ubixfs/ubixfs.c +++ b/src/sys/ubixfs/ubixfs.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.7 2004/05/19 15:20:06 reddawg + Fixed reference problems due to changes in drive subsystem + Revision 1.6 2004/05/19 04:07:43 reddawg kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been @@ -103,11 +106,11 @@ int openFileUbixFS(char *file,fileDescriptor *fd) { int x=0; - struct directoryEntry *dirEntry = (struct directoryEntry *)kmalloc(4096); + struct directoryEntry *dirEntry = (struct directoryEntry *)kmalloc(0x4000); struct ubixFsInfo *fsInfo = fd->mp->fsInfo; - fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,dirEntry,(fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[0].realSector),8); + fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,dirEntry,(fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[0].realSector),(0x4000/512)); if ((fd->mode & fileRead) == fileRead) { - for (x=0;x<(4096/sizeof(struct directoryEntry));x++) { + for (x=0;x<(0x4000/sizeof(struct directoryEntry));x++) { if ((int)!kstrcmp(dirEntry[x].fileName,file)) { fd->start = dirEntry[x].startCluster; fd->size = dirEntry[x].size; @@ -119,7 +122,7 @@ } } else if ((fd->mode & fileWrite) == fileWrite) { - for (x=0;x<(4096/sizeof(struct directoryEntry));x++) { + for (x=0;x<(0x4000/sizeof(struct directoryEntry));x++) { if (!kstrcmp(dirEntry[x].fileName,file)) { fd->start = dirEntry[x].startCluster; fd->size = dirEntry[x].size; diff --git a/src/sys/vfs/file.c b/src/sys/vfs/file.c index dd3f0c0..c2c2e26 100644 --- a/src/sys/vfs/file.c +++ b/src/sys/vfs/file.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.2 2004/05/19 04:07:43 reddawg + kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been + Revision 1.1.1.1 2004/04/15 12:06:53 reddawg UbixOS v1.0 @@ -155,6 +158,7 @@ } if (tmpFd->mp == 0x0) { //kpanic("Mount Point Bad"); + kprintf("Mount Point Bad\n"); return(0x0); } /* This Will Set Up The Descriptor Modes */ diff --git a/src/tools/Makefile b/src/tools/Makefile index bb653ed..578d568 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -48,8 +48,9 @@ (cp ../bin/cp/cp ./) #(cp ../bin/format/format ./) (cp ../bin/ubistry/ubistry ./) + (cp ../bin/launcher/launcher ./) (cp ../sys/boot/mbr/mbr ./) - (./format 50 2000 /dev/fd0 ubix.elf 0 login 3754 ROM8X14.DPF 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 ls 3754 motd 3754 fdisk 3754 mbr 3754 cp 3754 clock 3754) + (./format 50 2000 /dev/fd0 ubix.elf 0 login 3754 ROM8X14.DPF 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 ls 3754 motd 3754 fdisk 3754 mbr 3754 cp 3754 clock 3754 launcher 3754) #(./format 263 204361 /dev/md1 ubix.elf 0 format 3754 fdisk 3754 ROM8X14.DPF 3754 init 3754 login 3754 shell 3754 userdb 3754 ls 3754 motd 3754 cp 3754) (./format 1064 2000 /dev/fd0 shell 3754 clock 3754) @@ -66,3 +67,4 @@ #(rm -fr format) (rm -fr mbr) (rm -fr ubistry) + (rm -fr launcher)