diff --git a/src/sys/include/ubixfs/dirCache.h b/src/sys/include/ubixfs/dirCache.h index 3c57e62..95a2a08 100644 --- a/src/sys/include/ubixfs/dirCache.h +++ b/src/sys/include/ubixfs/dirCache.h @@ -10,7 +10,8 @@ struct cacheNode * parent; struct cacheNode * subDirsHead; struct cacheNode * subDirsTail; - struct directoryEntry * dirList; + void * info; + int flags; int dirListEntryCount; int dirty; unsigned int dirBlock; diff --git a/src/sys/ubixfs/dirCache.c b/src/sys/ubixfs/dirCache.c index de83c46..8e0fc27 100644 --- a/src/sys/ubixfs/dirCache.c +++ b/src/sys/ubixfs/dirCache.c @@ -119,7 +119,7 @@ assert(tmp); tmp->parent = tmp; tmp->prev = tmp->next = tmp->subDirsHead = tmp->subDirsTail = NULL; - tmp->dirList = NULL; + tmp->info = NULL; tmp->dirListEntryCount = tmp->dirty = tmp->dirBlock = 0; tmp->name = (char *)kmalloc(strlen(name)); strcpy(tmp->name, name); @@ -145,7 +145,7 @@ /* if (tmp->subDirsHead != NULL) */ ubixfs_dirCacheDelete(&tmp->subDirsHead); - kfree(tmp->dirList); + kfree(tmp->info); kfree(tmp->name); del = tmp; tmp = tmp->next; @@ -186,8 +186,14 @@ /*** $Log$ + Revision 1.6 2004/07/21 14:43:14 flameshadow + add: added cwc (current working container) to the osInfo strut + Revision 1.5 2004/07/20 19:21:30 reddawg - You like leaving out $Log$ so i don't know what is going on eh? + You like leaving out $Log$ + You like leaving out Revision 1.6 2004/07/21 14:43:14 flameshadow + You like leaving out add: added cwc (current working container) to the osInfo strut + You like leaving out so i don't know what is going on eh? END ***/ diff --git a/src/sys/ubixfs/ubixfs.c b/src/sys/ubixfs/ubixfs.c index 835ffcd..9afcf3e 100644 --- a/src/sys/ubixfs/ubixfs.c +++ b/src/sys/ubixfs/ubixfs.c @@ -112,10 +112,10 @@ fsInfo->dirCache = ubixfs_dirCacheNew("/"); assert(fsInfo->dirCache); /* mji */ - fsInfo->dirCache->dirList = kmalloc(0x4000); /* allocate root dir */ + fsInfo->dirCache->info = (struct directoryEntry *)kmalloc(0x4000); /* allocate root dir */ kprintf("\ncaching root dir [%i]\n",fsInfo->rootDir); mp->device->devInfo->read(mp->device->devInfo->info, - fsInfo->dirCache->dirList, + fsInfo->dirCache->info, (mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector), 0x4000 / 512); @@ -142,7 +142,8 @@ struct directoryEntry * dirEntry = NULL; struct ubixFSInfo *fsInfo = fd->mp->fsInfo; - kprintf("openFileUbixFS(%s)\n", file); + kprintf("openFileUbixFS(%s), cwd: %s\n", file, _current->oInfo.cwd); + assert(fd); assert(fd->mp); assert(fd->mp->device); @@ -154,7 +155,7 @@ /*mji rootDirCacheNode = ubixfs_dirCacheFind(fsInfo->dirCache, "/"); */ rootDirCacheNode = fsInfo->dirCache; assert(rootDirCacheNode); - dirEntry = rootDirCacheNode->dirList; + dirEntry = (struct directoryEntry *)rootDirCacheNode->info; assert(dirEntry); /* mji fd->mp->device->devInfo->read(fd->mp->device->devInfo->info, @@ -428,6 +429,9 @@ /*** $Log$ + Revision 1.26 2004/07/20 23:21:31 flameshadow + syncing + Revision 1.25 2004/07/20 21:39:53 reddawg ubixfs: does propper caching now problem was you did not seek realSector however the os starts but I am getting a segfault could be from anything haven't looked into it right quick