X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=573c68b3b5ef60a96cbea3252f530cd882547d00;hp=191ac8d520d0cf39d7897634d81be5bfa8462d03;hb=4be24c244e22ef029cf1f014c0cf8433a49a8a37;hpb=f43976eda35065890e7cf0a008e9518158eb71d6 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 191ac8d..573c68b 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -31,7 +31,7 @@ #define YAFFSFS_RW_SIZE (1<variant_type == YAFFS_OBJECT_TYPE_SYMLINK){ YCHAR *alias = obj->variant.symlink_variant.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; } @@ -500,9 +503,7 @@ static yaffs_obj_t *yaffsfs_DoFindDirectory(yaffs_obj_t *startDir, else{ dir = yaffs_find_by_name(dir,str); - while(dir && dir->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) - dir = yaffsfs_FollowLink(dir,symDepth); - + dir = yaffsfs_FollowLink(dir,symDepth); if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) dir = NULL; @@ -522,17 +523,23 @@ static yaffs_obj_t *yaffsfs_FindDirectory(yaffs_obj_t *relativeDirectory, /* * yaffsfs_FindObject turns a path for an existing object into the object */ -static yaffs_obj_t *yaffsfs_FindObject(yaffs_obj_t *relativeDirectory, const YCHAR *path,int symDepth) +static yaffs_obj_t *yaffsfs_FindObject(yaffs_obj_t *relativeDirectory, const YCHAR *path,int symDepth, int getEquiv) { yaffs_obj_t *dir; + yaffs_obj_t *obj; YCHAR *name; dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth); if(dir && *name) - return yaffs_find_by_name(dir,name); + obj = yaffs_find_by_name(dir,name); + else + obj = dir; - return dir; + if(getEquiv) + obj = yaffs_get_equivalent_obj(obj); + + return obj; } @@ -564,16 +571,19 @@ int yaffs_dup(int fd) } + + int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) { yaffs_obj_t *obj = NULL; yaffs_obj_t *dir = NULL; YCHAR *name; int handle = -1; - yaffsfs_Handle *h = NULL; + yaffsfs_Handle *yh = NULL; int openDenied = 0; int symDepth = 0; int errorReported = 0; + int rwflags = oflag & ( O_RDWR | O_RDONLY | O_WRONLY); __u8 shareRead = (sharing & YAFFS_SHARE_READ) ? 1 : 0; __u8 shareWrite = (sharing & YAFFS_SHARE_WRITE) ? 1 : 0; __u8 sharedReadAllowed; @@ -593,23 +603,26 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) /* Todo: Are there any more flag combos to sanitise ? */ + /* Figure out if reading or writing is requested */ + + readRequested = (rwflags == O_RDWR || rwflags == O_RDONLY) ? 1 : 0; + writeRequested = (rwflags == O_RDWR || rwflags == O_WRONLY) ? 1 : 0; yaffsfs_Lock(); handle = yaffsfs_GetNewHandle(); - if(handle >= 0){ + if(handle < 0){ + yaffsfs_SetError(-ENFILE); + errorReported = 1; + } else { - h = yaffsfs_GetHandlePointer(handle); + yh = yaffsfs_GetHandlePointer(handle); /* try to find the exisiting object */ - obj = yaffsfs_FindObject(NULL,path,0); + obj = yaffsfs_FindObject(NULL,path,0,1); - if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) - obj = yaffsfs_FollowLink(obj,symDepth++); - - if(obj) - obj = yaffs_get_equivalent_obj(obj); + obj = yaffsfs_FollowLink(obj,symDepth++); if(obj && obj->variant_type != YAFFS_OBJECT_TYPE_FILE && @@ -637,44 +650,37 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) } /* Check file permissions */ - if( (oflag & (O_RDWR | O_WRONLY)) == 0 && /* ie O_RDONLY */ - !(obj->yst_mode & S_IREAD)) + if( readRequested && !(obj->yst_mode & S_IREAD)) openDenied = 1; - if( (oflag & O_RDWR) && - !(obj->yst_mode & S_IREAD)) - openDenied = 1; - - if( (oflag & (O_RDWR | O_WRONLY)) && - !(obj->yst_mode & S_IWRITE)) + if( writeRequested && !(obj->yst_mode & S_IWRITE)) openDenied = 1; /* Check sharing of an existing object. */ { - yaffsfs_Handle *h; + yaffsfs_Handle *hx; int i; sharedReadAllowed = 1; sharedWriteAllowed = 1; alreadyReading = 0; alreadyWriting = 0; for( i = 0; i < YAFFSFS_N_HANDLES; i++){ - h = &yaffsfs_handle[i]; - if(h->useCount > 0 && - h->inodeId >= 0 && - yaffsfs_inode[h->inodeId].iObj == obj){ - if(!h->shareRead) + hx = &yaffsfs_handle[i]; + if(hx->useCount > 0 && + hx->inodeId >= 0 && + yaffsfs_inode[hx->inodeId].iObj == obj){ + if(!hx->shareRead) sharedReadAllowed = 0; - if(!h->shareWrite) + if(!hx->shareWrite) sharedWriteAllowed = 0; - if(h->reading) + if(hx->reading) alreadyReading = 1; - if(h->writing) - alreadyWriting = 0; + if(hx->writing) + alreadyWriting = 1; } } - readRequested = (oflag & (O_RDWR | O_RDONLY)) ? 1 : 0; - writeRequested = (oflag & (O_RDWR | O_WRONLY)) ? 1 : 0; + if((!sharedReadAllowed && readRequested)|| (!shareRead && alreadyReading) || @@ -710,18 +716,18 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) */ } - h->inodeId = inodeId; - h->reading = (oflag & (O_RDONLY | O_RDWR)) ? 1 : 0; - h->writing = (oflag & (O_WRONLY | O_RDWR)) ? 1 : 0; - h->append = (oflag & O_APPEND) ? 1 : 0; - h->position = 0; - h->shareRead = shareRead; - h->shareWrite = shareWrite; + yh->inodeId = inodeId; + yh->reading = readRequested; + yh->writing = writeRequested; + yh->append = (oflag & O_APPEND) ? 1 : 0; + yh->position = 0; + yh->shareRead = shareRead; + yh->shareWrite = shareWrite; /* Hook inode to object */ obj->my_inode = (void*) &yaffsfs_inode[inodeId]; - if((oflag & O_TRUNC) && h->writing) + if((oflag & O_TRUNC) && yh->writing) yaffs_resize_file(obj,0); } else { yaffsfs_PutHandle(handle); @@ -828,7 +834,11 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off /* bad handle */ yaffsfs_SetError(-EBADF); totalRead = -1; - } else if( h && obj){ + } else if(!h->reading){ + /* Not a reading handle */ + yaffsfs_SetError(-EINVAL); + totalRead = -1; + } else { if(isPread) startPos = offset; else @@ -923,7 +933,7 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, } else if( h && obj && (!h->writing || obj->my_dev->read_only)){ yaffsfs_SetError(-EINVAL); totalWritten=-1; - } else if( h && obj){ + } else { if(h->append) startPos = yaffs_get_obj_length(obj); else if(isPwrite) @@ -995,9 +1005,7 @@ int yaffs_truncate(const YCHAR *path,off_t new_size) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); - if(obj) - obj = yaffs_get_equivalent_obj(obj); + obj = yaffsfs_FindObject(NULL,path,0,1); if(!obj) yaffsfs_SetError(-ENOENT); @@ -1089,7 +1097,7 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) 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); @@ -1140,7 +1148,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) 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 */ @@ -1185,8 +1193,7 @@ static int yaffsfs_DoStat(yaffs_obj_t *obj,struct yaffs_stat *buf) { int retVal = -1; - if(obj) - obj = yaffs_get_equivalent_obj(obj); + obj = yaffs_get_equivalent_obj(obj); if(obj && buf){ buf->st_dev = (int)obj->my_dev->os_context; @@ -1231,7 +1238,8 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d 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); @@ -1289,7 +1297,8 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da 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); @@ -1353,7 +1362,8 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in 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); @@ -1416,7 +1426,8 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo 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); @@ -1478,7 +1489,8 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) 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); @@ -1637,7 +1649,8 @@ int yaffs_access(const YCHAR *path, int amode) int retval = 0; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); + + obj = yaffsfs_FindObject(NULL,path,0,1); if(obj) { int access_ok = 1; @@ -1673,7 +1686,8 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) int retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); + + obj = yaffsfs_FindObject(NULL,path,0,1); if(!obj) yaffsfs_SetError(-ENOENT); @@ -2088,7 +2102,7 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,dirname,0); + obj = yaffsfs_FindObject(NULL,dirname,0,1); if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ @@ -2216,7 +2230,7 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); + obj = yaffsfs_FindObject(NULL,path,0,1); if(!obj) { yaffsfs_SetError(-ENOENT); @@ -2245,8 +2259,8 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) 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); @@ -2314,13 +2328,16 @@ int yaffs_n_handles(const YCHAR *path) { yaffs_obj_t *obj; - obj = yaffsfs_FindObject(NULL,path,0); - if(obj) - obj = yaffs_get_equivalent_obj(obj); + obj = yaffsfs_FindObject(NULL,path,0,1); return yaffsfs_CountHandles(obj); } +int yaffs_get_error(void) +{ + return yaffsfs_GetLastError(); +} + int yaffs_dump_dev(const YCHAR *path) { #if 0