X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=e082dfd95f3f700c6860d5649179faa87dbb96c5;hb=7e03669f1fdf249268ca1021522e5d0f45eec19c;hp=f0e1f45b3b781c27ab1ab6291d6dd5ff94f19498;hpb=772130e8c8c957916c1925edddf1e1c6bf6963e2;p=yaffs2.git diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index f0e1f45..e082dfd 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -14,8 +14,10 @@ #include "yaffsfs.h" #include "yaffs_guts.h" #include "yaffscfg.h" -#include // for memset #include "yportenv.h" +#include "yaffs_trace.h" + +#include // for memset #define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5 @@ -24,7 +26,12 @@ #endif -const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.28 2009-10-19 23:42:55 charles Exp $"; +/* YAFFSFS_RW_SIZE must be a power of 2 */ +#define YAFFSFS_RW_SHIFT (13) +#define YAFFSFS_RW_SIZE (1<inUse) - return h->obj; + if(h && h->useCount > 0 && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES) + return &yaffsfs_inode[h->inodeId]; + + return NULL; +} + +yaffs_Object *yaffsfs_GetHandleObject(int handle) +{ + yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle); + + if(in) + return in->iObj; return NULL; } +//yaffsfs_GetInodeIdForObject +// Grab an inode entry when opening a new inode. +// + +static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj) +{ + int i; + int ret = -1; + yaffsfs_Inode *in = NULL; + + if(obj) + obj = yaffs_GetEquivalentObject(obj); + + /* Look for it. If we can't find it then make one */ + for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){ + if(yaffsfs_inode[i].iObj == obj) + ret = i; + } + + for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){ + if(!yaffsfs_inode[i].iObj) + ret = i; + } + + + if(ret>=0){ + in = &yaffsfs_inode[ret]; + if(!in->iObj) + in->count = 0; + in->iObj = obj; + in->count++; + } + + + return ret; +} + +static void yaffsfs_ReleaseInode(yaffsfs_Inode *in) +{ + yaffs_Object *obj; + + obj = in->iObj; + + if(obj->unlinked) + yaffs_DeleteObject(obj); + + obj->myInode = NULL; + in->iObj = NULL; + +} + +static void yaffsfs_PutInode(int inodeId) +{ + if(inodeId >= 0 && inodeId < YAFFSFS_N_HANDLES){ + yaffsfs_Inode *in = & yaffsfs_inode[inodeId]; + in->count--; + if(in->count <= 0) + yaffsfs_ReleaseInode(in); + } +} + //yaffsfs_GetHandle // Grab a handle (when opening a file) // -static int yaffsfs_GetHandle(void) +static int yaffsfs_GetNewHandle(void) { int i; yaffsfs_Handle *h; @@ -99,31 +183,51 @@ static int yaffsfs_GetHandle(void) if(!h){ // todo bug: should never happen } - if(!h->inUse){ + if(h->useCount < 1){ memset(h,0,sizeof(yaffsfs_Handle)); - h->inUse=1; + h->inodeId=-1; + h->useCount=1; return i; } } return -1; } +// yaffs_GetHandle +// Increase use of handle when reading/writing a file +static int yaffsfs_GetHandle(int handle) +{ + yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + + if(h && h->useCount > 0){ + h->useCount++; + } + return 0; +} + // yaffs_PutHandle -// Let go of a handle (when closing a file) +// Let go of a handle when closing a file or aborting an open or +// ending a read or write. // static int yaffsfs_PutHandle(int handle) { yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); - if(h){ - h->inUse = 0; - h->obj = NULL; + if(h && h->useCount > 0){ + h->useCount--; + if(h->useCount < 1){ + if(h->inodeId >= 0){ + yaffsfs_PutInode(h->inodeId); + h->inodeId = -1; + } + } } return 0; } + // Stuff to search for a directory from a path @@ -378,8 +482,8 @@ int yaffs_dup(int fd) yaffsfs_Lock(); oldPtr = yaffsfs_GetHandlePointer(fd); - if(oldPtr && oldPtr->inUse) - newHandle = yaffsfs_GetHandle(); + if(oldPtr && oldPtr->useCount > 0) + newHandle = yaffsfs_GetNewHandle(); if(newHandle >= 0) newPtr = yaffsfs_GetHandlePointer(newHandle); @@ -418,7 +522,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) yaffsfs_Lock(); - handle = yaffsfs_GetHandle(); + handle = yaffsfs_GetNewHandle(); if(handle >= 0){ @@ -431,6 +535,9 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) obj = yaffsfs_FollowLink(obj,symDepth++); + if(obj) + obj = yaffs_GetEquivalentObject(obj); + if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE) obj = NULL; @@ -439,10 +546,9 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) alreadyOpen = alreadyExclusive = 0; for(i = 0; i < YAFFSFS_N_HANDLES; i++){ - if(i != handle && - yaffsfs_handle[i].inUse && - obj == yaffsfs_handle[i].obj){ + yaffsfs_handle[i].useCount > 0 && + obj == yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj){ alreadyOpen = 1; if(yaffsfs_handle[i].exclusive) alreadyExclusive = 1; @@ -484,14 +590,24 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) } if(obj && !openDenied) { - h->obj = obj; - h->inUse = 1; + int inodeId = yaffsfs_GetInodeIdForObject(obj); + + if(inodeId<0) { + /* + * Todo: Fix any problem if inodes run out, though that + * can't happen if the number of inode items >= number of handles. + */ + } + + h->inodeId = inodeId; h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1; h->append = (oflag & O_APPEND) ? 1 : 0; h->exclusive = (oflag & O_EXCL) ? 1 : 0; h->position = 0; - obj->inUse++; + /* Hook inode to object */ + obj->myInode = (void*) &yaffsfs_inode[inodeId]; + if((oflag & O_TRUNC) && !h->readOnly) yaffs_ResizeFile(obj,0); } else { @@ -518,9 +634,9 @@ int yaffs_Dofsync(int fd,int datasync) h = yaffsfs_GetHandlePointer(fd); - if(h && h->inUse) + if(h && h->useCount > 0) // flush the file - yaffs_FlushFile(h->obj,1,datasync); + yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync); else { // bad handle yaffsfs_SetError(-EBADF); @@ -556,13 +672,9 @@ int yaffs_close(int fd) h = yaffsfs_GetHandlePointer(fd); - if(h && h->inUse) { + if(h && h->useCount > 0) { // clean up - yaffs_FlushFile(h->obj,1,0); - h->obj->inUse--; - if(h->obj->inUse <= 0 && h->obj->unlinked) - yaffs_DeleteObject(h->obj); - + yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,0); yaffsfs_PutHandle(fd); retVal = 0; } else { @@ -576,24 +688,33 @@ int yaffs_close(int fd) return retVal; } -int yaffs_read(int fd, void *buf, unsigned int nbyte) + + +int yaffsfs_do_read(int fd, void *buf, unsigned int nbyte, int isPread, int offset) { yaffsfs_Handle *h = NULL; yaffs_Object *obj = NULL; int pos = 0; - int nRead = -1; + int startPos = 0; + int nRead = 0; + int nToRead = 0; + int totalRead = 0; unsigned int maxRead; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); obj = yaffsfs_GetHandleObject(fd); - if(!h || !obj) + if(!h || !obj){ // bad handle yaffsfs_SetError(-EBADF); - - else if( h && obj){ - pos= h->position; + totalRead = -1; + } else if( h && obj){ + if(isPread) + startPos = offset; + else + startPos = h->position; + if(yaffs_GetObjectFileLength(obj) > pos) maxRead = yaffs_GetObjectFileLength(obj) - pos; else @@ -604,136 +725,152 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte) if(nbyte > 0) { - nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte); - if(nRead >= 0) - h->position = pos + nRead; - else { - //todo error + yaffsfs_GetHandle(fd); + pos = startPos; + + while(nbyte > 0) { + nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); + if(nToRead > nbyte) + nToRead = nbyte; + + nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead); + + if(nRead > 0){ + totalRead += nRead; + pos += nRead; + buf += nRead; + } + + if(nRead == nToRead) + nbyte-=nRead; + else + nbyte = 0; /* no more to read */ + + + if(nbyte > 0){ + yaffsfs_Unlock(); + yaffsfs_Lock(); + } + + } + + yaffsfs_PutHandle(fd); + if(!isPread) { + if(totalRead >= 0) + h->position = startPos + totalRead; + else { + //todo error + } } } else - nRead = 0; + totalRead = 0; } yaffsfs_Unlock(); + return (totalRead >= 0) ? totalRead : -1; - return (nRead >= 0) ? nRead : -1; +} +int yaffs_read(int fd, void *buf, unsigned int nbyte) +{ + return yaffsfs_do_read(fd, buf, nbyte, 0, 0); } int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset) { - yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; - int pos = 0; - int nRead = -1; - unsigned int maxRead; - - yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); - - if(!h || !obj) - // bad handle - yaffsfs_SetError(-EBADF); - else if( h && obj) { - pos= offset; - if(yaffs_GetObjectFileLength(obj) > pos) - maxRead = yaffs_GetObjectFileLength(obj) - pos; - else - maxRead = 0; - - if(nbyte > maxRead) - nbyte = maxRead; - - - if(nbyte > 0) - nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte); - else - nRead = 0; - } - - yaffsfs_Unlock(); - - - return (nRead >= 0) ? nRead : -1; - + return yaffsfs_do_read(fd, buf, nbyte, 1, offset); } -int yaffs_write(int fd, const void *buf, unsigned int nbyte) +int yaffsfs_do_write(int fd, const void *buf, unsigned int nbyte, int isPwrite, int offset) { yaffsfs_Handle *h = NULL; yaffs_Object *obj = NULL; int pos = 0; - int nWritten = -1; + int startPos = 0; + int nWritten = 0; + int totalWritten = 0; int writeThrough = 0; + int nToWrite = 0; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); obj = yaffsfs_GetHandleObject(fd); - if(!h || !obj) + if(!h || !obj){ // bad handle yaffsfs_SetError(-EBADF); - else if( h && obj && h->readOnly){ - // todo error + totalWritten = -1; + } else if( h && obj && h->readOnly){ + yaffsfs_SetError(-EINVAL); + totalWritten=-1; } else if( h && obj){ + if(isPwrite) + startPos = offset; if(h->append) - pos = yaffs_GetObjectFileLength(obj); + startPos = yaffs_GetObjectFileLength(obj); else - pos = h->position; + startPos = h->position; + if( nbyte > 0){ + yaffsfs_GetHandle(fd); + pos = startPos; + while(nbyte > 0) { + nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); + if(nToWrite > nbyte) + nToWrite = nbyte; + + nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough); + if(nWritten > 0){ + totalWritten += nWritten; + pos += nWritten; + buf += nWritten; + } - nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough); + if(nWritten == nToWrite) + nbyte -= nToWrite; + else + nbyte = 0; + + if(nWritten < 1 && totalWritten < 1){ + yaffsfs_SetError(-ENOSPC); + totalWritten = -1; + } - if(nWritten >= 0) - h->position = pos + nWritten; - else { - //todo error - } + if(nbyte > 0){ + yaffsfs_Unlock(); + yaffsfs_Lock(); + } + } + + yaffsfs_PutHandle(fd); + + if(!isPwrite){ + if(totalWritten > 0) + h->position = startPos + totalWritten; + else { + //todo error + } + } + } else + totalWritten = 0; } yaffsfs_Unlock(); + return (totalWritten >= 0) ? totalWritten : -1; - return (nWritten >= 0) ? nWritten : -1; +} +int yaffs_write(int fd, const void *buf, unsigned int nbyte) +{ + return yaffsfs_do_write(fd, buf, nbyte, 0, 0); } int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset) { - yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; - int pos = 0; - int nWritten = -1; - int writeThrough = 0; - - yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); - - if(!h || !obj) - // bad handle - yaffsfs_SetError(-EBADF); - else if( h && obj && h->readOnly){ - // todo error - } - else if( h && obj){ - pos = offset; - - nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough); - - if(nWritten < 0 || ((unsigned int)nWritten) < nbyte) - yaffsfs_SetError(-ENOSPC); - - } - - yaffsfs_Unlock(); - - - return (nWritten >= 0) ? nWritten : -1; - + return yaffsfs_do_write(fd, buf, nbyte, 1, offset); } @@ -1296,7 +1433,7 @@ int yaffs_unmount(const YCHAR *path) yaffs_CheckpointSave(dev); for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ - if(yaffsfs_handle[i].inUse && yaffsfs_handle[i].obj->myDev == dev) + if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev) inUse = 1; // the device is in use, can't unmount } @@ -1544,7 +1681,7 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) dsc->de.d_dont_use = (unsigned)dsc->nextReturn; dsc->de.d_off = dsc->offset++; yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX); - if(yaffs_strlen(dsc->de.d_name) == 0) + if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0) { // this should not happen! yaffs_strcpy(dsc->de.d_name,_Y("zz")); @@ -1652,6 +1789,7 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) yaffs_Object *obj = NULL; yaffs_Object *target = NULL; int retVal = 0; + int newNameLength = 0; yaffsfs_Lock(); @@ -1680,8 +1818,18 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) yaffsfs_SetError(-EXDEV); retVal = -1; } - - if(newdir && yaffs_strlen(newname) > 0) { + + newNameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1); + + if(newNameLength == 0){ + yaffsfs_SetError(-ENOENT); + retVal = -1; + } else if (newNameLength > YAFFS_MAX_NAME_LENGTH){ + yaffsfs_SetError(-ENAMETOOLONG); + retVal = -1; + } + + if(retVal == 0) { link = yaffs_Link(newdir,newname,obj); if(link) retVal = 0;