diff --git a/src/bin/ls/main.c b/src/bin/ls/main.c index 95fa34c..311e901 100755 --- a/src/bin/ls/main.c +++ b/src/bin/ls/main.c @@ -48,7 +48,7 @@ printf("data: [%i]\n",dirEntry); fread(dirEntry,4096,1,fd); printf("data: [%i]\n",dirEntry); - printf("Test: [%s]\n",dirEntry->fileName); + printf("%s\n",dirEntry[0].fileName[1]); /* for (i=0;i<(4096/sizeof(struct directoryEntry));i++) { printf("FileName: [%s]\n",dirEntry[i].fileName); diff --git a/src/sys/include/ubixfs/file.h b/src/sys/include/ubixfs/file.h index d0a9ddd..d1cbf9c 100755 --- a/src/sys/include/ubixfs/file.h +++ b/src/sys/include/ubixfs/file.h @@ -33,7 +33,7 @@ #define fdEof 4 typedef struct kernelFileDescriptorStruct { - struct fileDescriptorStruct *next; + struct kernelFileDescriptorStruct *next; uShort status; uShort mode; uShort offset; diff --git a/src/sys/ubixfs/file.c b/src/sys/ubixfs/file.c index 2899e3b..9a49d30 100755 --- a/src/sys/ubixfs/file.c +++ b/src/sys/ubixfs/file.c @@ -166,7 +166,7 @@ if (tmpFd == fd) { ch = getFileByte(tmpFd,tmpFd->offset); tmpFd->offset++; -// kprintf("file byte [%c]",ch); + //kprintf("file byte [%c]",ch); return(ch); } } @@ -202,9 +202,8 @@ fileDescriptor *tmpFd = 0x0; asm("":"=b" (data),"=c" (size),"=d" (userFd)); tmpFd = userFd->fd; -// kprintf("[%i]Size: [%i][%i][%s]\n",data,size,tmpFd->size,tmpFd->fileName); for (i=0;i