#define YAFFSFS_RW_SIZE (1<<YAFFSFS_RW_SHIFT)
/* Some forward references */
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
+static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth, int getEquiv);
static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
unsigned int yaffs_wr_attempts;
} yaffsfs_Inode;
typedef struct{
- __u8 readOnly:1;
+ __u8 reading:1;
+ __u8 writing:1;
__u8 append:1;
- int inodeId:13; /* Index to corresponding yaffsfs_Inode */
- int useCount:16; /* Use count for this handle */
+ __u8 shareRead:1;
+ __u8 shareWrite:1;
+ int inodeId:12; /* Index to corresponding yaffsfs_Inode */
+ int useCount:10; /* Use count for this handle */
__u32 position; /* current position in file */
}yaffsfs_Handle;
}
/*
- * yaffsfs_GetInodeIdForObject
- * Grab an inode entry when opening a new inode.
+ * yaffsfs_FindInodeIdForObject
+ * Find the inode entry for an object, if it exists.
*/
-static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+static int yaffsfs_FindInodeIdForObject(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 */
+ /* Look for it in open inode table*/
for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
if(yaffsfs_inode[i].iObj == obj)
ret = i;
}
+ return ret;
+}
+
+/*
+ * yaffsfs_GetInodeIdForObject
+ * Grab an inode entry when opening a new inode.
+ */
+static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+{
+ int i;
+ int ret;
+ yaffsfs_Inode *in = NULL;
+
+ if(obj)
+ obj = yaffs_GetEquivalentObject(obj);
+
+ ret = yaffsfs_FindInodeIdForObject(obj);
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)
return ret;
}
+
+static int yaffsfs_CountHandles(yaffs_Object *obj)
+{
+ int i = yaffsfs_FindInodeIdForObject(obj);
+
+ if(i >= 0)
+ return yaffsfs_inode[i].count;
+ else
+ return 0;
+}
+
static void yaffsfs_ReleaseInode(yaffsfs_Inode *in)
{
yaffs_Object *obj;
static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
{
+ if(obj)
+ obj = yaffs_GetEquivalentObject(obj);
+
while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
YCHAR *alias = obj->variant.symLinkVariant.alias;
if(yaffsfs_IsPathDivider(*alias))
/* Starts with a /, need to scan from root up */
- obj = yaffsfs_FindObject(NULL,alias,symDepth++);
+ obj = yaffsfs_FindObject(NULL,alias,symDepth++,1);
else
/* Relative to here, so use the parent of the symlink as a start */
- obj = yaffsfs_FindObject(obj->parent,alias,symDepth++);
+ obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1);
}
return obj;
}
else{
dir = yaffs_FindObjectByName(dir,str);
- while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- dir = yaffsfs_FollowLink(dir,symDepth);
+ dir = yaffsfs_FollowLink(dir,symDepth);
if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
/*
* yaffsfs_FindObject turns a path for an existing object into the object
*/
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth)
+static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth,int getEquiv)
{
yaffs_Object *dir;
+ yaffs_Object *obj;
YCHAR *name;
dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
if(dir && *name)
- return yaffs_FindObjectByName(dir,name);
+ obj = yaffs_FindObjectByName(dir,name);
+ else
+ obj = dir;
+ if(getEquiv)
+ obj = yaffs_GetEquivalentObject(obj);
- return dir;
+ return obj;
}
}
-int yaffs_open(const YCHAR *path, int oflag, int mode)
+int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
{
yaffs_Object *obj = NULL;
yaffs_Object *dir = NULL;
YCHAR *name;
int handle = -1;
- yaffsfs_Handle *h = NULL;
+ yaffsfs_Handle *yh = NULL;
int openDenied = 0;
int symDepth = 0;
int errorReported = 0;
+ __u8 shareRead = (sharing & YAFFS_SHARE_READ) ? 1 : 0;
+ __u8 shareWrite = (sharing & YAFFS_SHARE_WRITE) ? 1 : 0;
+ __u8 sharedReadAllowed;
+ __u8 sharedWriteAllowed;
+ __u8 alreadyReading;
+ __u8 alreadyWriting;
+ __u8 readRequested;
+ __u8 writeRequested;
/* O_EXCL only has meaning if O_CREAT is specified */
if(!(oflag & O_CREAT))
if(handle >= 0){
- h = yaffsfs_GetHandlePointer(handle);
-
+ yh = yaffsfs_GetHandlePointer(handle);
/* try to find the exisiting object */
- obj = yaffsfs_FindObject(NULL,path,0);
-
- if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- obj = yaffsfs_FollowLink(obj,symDepth++);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
- if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffsfs_FollowLink(obj,symDepth++);
if(obj &&
obj->variantType != YAFFS_OBJECT_TYPE_FILE &&
!(obj->yst_mode & S_IWRITE))
openDenied = 1;
+ /* Check sharing of an existing object. */
+ {
+ yaffsfs_Handle *hx;
+ int i;
+ sharedReadAllowed = 1;
+ sharedWriteAllowed = 1;
+ alreadyReading = 0;
+ alreadyWriting = 0;
+ for( i = 0; i < YAFFSFS_N_HANDLES; i++){
+ hx = &yaffsfs_handle[i];
+ if(hx->useCount > 0 &&
+ hx->inodeId >= 0 &&
+ yaffsfs_inode[hx->inodeId].iObj == obj){
+ if(!hx->shareRead)
+ sharedReadAllowed = 0;
+ if(!hx->shareWrite)
+ sharedWriteAllowed = 0;
+ if(hx->reading)
+ alreadyReading = 1;
+ if(hx->writing)
+ alreadyWriting = 0;
+ }
+ }
+
+ readRequested = (oflag & (O_RDWR | O_RDONLY)) ? 1 : 0;
+ writeRequested = (oflag & (O_RDWR | O_WRONLY)) ? 1 : 0;
+
+ if((!sharedReadAllowed && readRequested)||
+ (!shareRead && alreadyReading) ||
+ (!sharedWriteAllowed && writeRequested) ||
+ (!shareWrite && alreadyWriting)){
+ openDenied = 1;
+ yaffsfs_SetError(-EBUSY);
+ errorReported=1;
+ }
+ }
+
} else if((oflag & O_CREAT)) {
/* Let's see if we can create this file */
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
*/
}
- h->inodeId = inodeId;
- h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1;
- h->append = (oflag & O_APPEND) ? 1 : 0;
- h->position = 0;
+ yh->inodeId = inodeId;
+ yh->reading = (oflag & (O_RDONLY | O_RDWR)) ? 1 : 0;
+ yh->writing = (oflag & (O_WRONLY | O_RDWR)) ? 1 : 0;
+ yh->append = (oflag & O_APPEND) ? 1 : 0;
+ yh->position = 0;
+ yh->shareRead = shareRead;
+ yh->shareWrite = shareWrite;
/* Hook inode to object */
obj->myInode = (void*) &yaffsfs_inode[inodeId];
- if((oflag & O_TRUNC) && !h->readOnly)
+ if((oflag & O_TRUNC) && yh->writing)
yaffs_ResizeFile(obj,0);
} else {
yaffsfs_PutHandle(handle);
return handle;
}
+int yaffs_open(const YCHAR *path, int oflag, int mode)
+{
+ return yaffs_open_sharing(path, oflag, mode, YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
+}
+
int yaffs_Dofsync(int fd,int datasync)
{
yaffsfs_Handle *h = NULL;
/* bad handle */
yaffsfs_SetError(-EBADF);
totalWritten = -1;
- } else if( h && obj && (h->readOnly || obj->myDev->readOnly)){
+ } else if( h && obj && (!h->writing || obj->myDev->readOnly)){
yaffsfs_SetError(-EINVAL);
totalWritten=-1;
} else if( h && obj){
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
- if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj)
yaffsfs_SetError(-ENOENT);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+ obj = yaffsfs_FindObject(NULL,path,0,0);
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
if(!dir)
yaffsfs_SetError(-ENOTDIR);
olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
- obj = yaffsfs_FindObject(NULL,oldPath,0);
+ obj = yaffsfs_FindObject(NULL,oldPath,0,0);
if(!olddir || !newdir || !obj) {
/* bad file */
{
int retVal = -1;
- if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffs_GetEquivalentObject(obj);
if(obj && buf){
buf->st_dev = (int)obj->myDev->osContext;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!doLStat && obj)
obj = yaffsfs_FollowLink(obj,0);
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
int retval = 0;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(obj) {
int access_ok = 1;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj)
yaffsfs_SetError(-ENOENT);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,dirname,0);
+ obj = yaffsfs_FindObject(NULL,dirname,0,1);
if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj) {
yaffsfs_SetError(-ENOENT);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,oldpath,0);
- target = yaffsfs_FindObject(NULL,newpath,0);
+ obj = yaffsfs_FindObject(NULL,oldpath,0,1);
+ target = yaffsfs_FindObject(NULL,newpath,0,0);
if(!obj) {
yaffsfs_SetError(-ENOENT);
return -1;
}
+
+
+/*
+ * yaffs_n_handles()
+ * Returns number of handles attached to the object
+ */
+int yaffs_n_handles(const YCHAR *path)
+{
+ yaffs_Object *obj;
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ return yaffsfs_CountHandles(obj);
+}
+
+int yaffs_get_error(void)
+{
+ return yaffsfs_GetLastError();
+}
+
int yaffs_DumpDevStruct(const YCHAR *path)
{
#if 0