diff --git a/src/bin/init/main.c b/src/bin/init/main.c index 6db8033..d527a27 100755 --- a/src/bin/init/main.c +++ b/src/bin/init/main.c @@ -50,7 +50,6 @@ while(1); } printf("I'm The Parent!\n"); -// exec("shell"); - while (1); +// while (1); exit(1); } \ No newline at end of file diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 2a7c4ad..57c2930 100755 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -73,12 +73,7 @@ while(1); } -void test() { - while (1); - } - int main() { - char *test; clearScreen(); outputVersion(); //Display Version Info init8259(); //Initialize PIC diff --git a/src/sys/kernel/kmalloc.c b/src/sys/kernel/kmalloc.c index 63c3746..614224a 100755 --- a/src/sys/kernel/kmalloc.c +++ b/src/sys/kernel/kmalloc.c @@ -23,6 +23,8 @@ #include #include +#include +#include struct memDescriptor { void *page; @@ -37,7 +39,7 @@ void initMalloc() { int i = 0; struct memDescriptor *tmpDesc = 0x0; - kernDesc = allocPage(); + kernDesc = (void *)allocPage(); tmpDesc = kernDesc; for (i=0;i<4096;i+=16) { tmpDesc->page = 0x0; @@ -65,7 +67,7 @@ } void *kmalloc(uInt len) { - void *ret; + void *ret = 0x0; struct memDescriptor *tmpDesc = 0x0,*newDesc = 0x0; if (!kernDesc) { initMalloc(); @@ -81,8 +83,8 @@ ret = tmpDesc->base; break; } - if (tmpDesc->page == 0) { - tmpDesc->page = allocPage(); + if (tmpDesc->page == 0x0) { + tmpDesc->page = (void *)allocPage(); tmpDesc->base = tmpDesc->page; tmpDesc->limit = len; tmpDesc->counter = 1; diff --git a/src/sys/ubixfs/file.c b/src/sys/ubixfs/file.c index 1b686e3..aad940b 100755 --- a/src/sys/ubixfs/file.c +++ b/src/sys/ubixfs/file.c @@ -48,12 +48,11 @@ for (i=0;i #include #include -#include +#include int startSector; @@ -90,19 +90,21 @@ } int findFile(char *file,int i) { - int i=0; + int x=0; bool ret = TRUE; struct fileTableEntry *ft; - char *data = allocPage(); + char *data = kmalloc(4096); ret = (bool)readBlock(startSector,data,8); ft = (void *)data; - for (i=0;i<128;i++) { - if ((int)!kstrcmp(ft[i].fileName,file)) { - fdTable[i].start = ft[i].start; - fdTable[i].length = ft[i].length; - fdTable[i].size = ft[i].size; + for (x=0;x<128;x++) { + if ((int)!kstrcmp(ft[x].fileName,file)) { + fdTable[i].start = ft[x].start; + fdTable[i].length = ft[x].length; + fdTable[i].size = ft[x].size; + kfree(data); return((int)1); } } + kfree(data); return((int)0); } \ No newline at end of file