X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=5194dd483f0c25e9568ce1913da20c9af1e86164;hp=bb6f5f63f390c6e90bc6929d5623883cd7c3f6fe;hb=26d3321e95784921c9fd24d80c9f738c57ef3aa1;hpb=ea3c314412ed2ecee3f47b576d5759267173e9c0 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index bb6f5f6..5194dd4 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2007 Aleph One Ltd. + * Copyright (C) 2002-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -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,46 +26,79 @@ #endif -const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.29 2009-12-07 01:17:33 charles Exp $"; - -// configurationList is the list of devices that are supported -static yaffsfs_DeviceConfiguration *yaffsfs_configurationList; - +/* 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; } +struct yaffs_obj *yaffsfs_GetHandleObject(int handle) +{ + yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle); + + if(in) + return in->iObj; + + return NULL; +} + +/* + * yaffsfs_FindInodeIdForObject + * Find the inode entry for an object, if it exists. + */ + +static int yaffsfs_FindInodeIdForObject(struct yaffs_obj *obj) +{ + int i; + int ret = -1; + + if(obj) + obj = yaffs_get_equivalent_obj(obj); + + /* 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(struct yaffs_obj *obj) +{ + int i; + int ret; + yaffsfs_Inode *in = NULL; + + if(obj) + obj = yaffs_get_equivalent_obj(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) + in->count = 0; + in->iObj = obj; + in->count++; + } + + + return ret; +} + + +static int yaffsfs_CountHandles(struct yaffs_obj *obj) +{ + int i = yaffsfs_FindInodeIdForObject(obj); + + if(i >= 0) + return yaffsfs_inode[i].count; + else + return 0; +} + +static void yaffsfs_ReleaseInode(yaffsfs_Inode *in) +{ + struct yaffs_obj *obj; + + obj = in->iObj; + + if(obj->unlinked) + yaffs_del_obj(obj); + + obj->my_inode = 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); + in->count = 0; + } + } +} + -//yaffsfs_GetHandle -// Grab a handle (when opening a file) -// +/* + * yaffsfs_GetHandle + * Grab a handle (when opening a file) + */ -static int yaffsfs_GetHandle(void) +static int yaffsfs_GetNewHandle(void) { int i; yaffsfs_Handle *h; @@ -97,45 +233,86 @@ static int yaffsfs_GetHandle(void) for(i = 0; i < YAFFSFS_N_HANDLES; i++){ h = yaffsfs_GetHandlePointer(i); if(!h){ - // todo bug: should never happen + /* 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_PutHandle -// Let go of a handle (when closing a file) -// +/* + * yaffs_get_handle + * 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_put_handle + * 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; } +static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev) +{ + yaffsfs_Handle *h; + struct yaffs_obj *obj; + int i; + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + h = yaffsfs_GetHandlePointer(i); + obj = yaffsfs_GetHandleObject(i); + if(h && h->useCount>0 && obj && obj->my_dev == dev){ + h->useCount = 0; + yaffsfs_PutInode(h->inodeId); + h->inodeId = -1; + } + } +} + + -// Stuff to search for a directory from a path +/* + * Stuff to handle names. + */ int yaffsfs_Match(YCHAR a, YCHAR b) { - // case sensitive + /* case sensitive */ return (a == b); } int yaffsfs_IsPathDivider(YCHAR ch) { - YCHAR *str = YAFFS_PATH_DIVIDERS; + const YCHAR *str = YAFFS_PATH_DIVIDERS; while(*str){ if(*str == ch) @@ -146,41 +323,102 @@ int yaffsfs_IsPathDivider(YCHAR ch) return 0; } -// yaffsfs_FindDevice -// yaffsfs_FindRoot -// Scan the configuration list to find the root. -// Curveballs: Should match paths that end in '/' too -// Curveball2 Might have "/x/ and "/x/y". Need to return the longest match -static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) +int yaffsfs_CheckNameLength(const char *name) +{ + int retVal = 0; + + int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1); + + if(nameLength == 0){ + yaffsfs_SetError(-ENOENT); + retVal = -1; + } else if (nameLength > YAFFS_MAX_NAME_LENGTH){ + yaffsfs_SetError(-ENAMETOOLONG); + retVal = -1; + } + + return retVal; +} + + +static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path) +{ + YCHAR *alt_path = NULL; + int path_length; + int i; + + /* + * We don't have a definition for max path length. + * We will use 3 * max name length instead. + */ + *ret_path = NULL; + path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1); + + /* If the last character is a path divider, then we need to + * trim it back so that the name look-up works properly. + * eg. /foo/new_dir/ -> /foo/newdir + * Curveball: Need to handle multiple path dividers: + * eg. /foof/sdfse///// -> /foo/sdfse + */ + if(path_length > 0 && + yaffsfs_IsPathDivider(path[path_length-1])){ + alt_path = YMALLOC(path_length + 1); + if(!alt_path) + return -1; + strcpy(alt_path, path); + for(i = path_length-1; + i >= 0 && yaffsfs_IsPathDivider(alt_path[i]); + i--) + alt_path[i] = (YCHAR) 0; + } + *ret_path = alt_path; + return 0; +} + + +LIST_HEAD(yaffsfs_deviceList); + +/* + * yaffsfs_FindDevice + * yaffsfs_FindRoot + * Scan the configuration list to find the device + * Curveballs: Should match paths that end in '/' too + * Curveball2 Might have "/x/ and "/x/y". Need to return the longest match + */ +static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) { - yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList; + struct list_head *cfg; const YCHAR *leftOver; const YCHAR *p; - yaffs_Device *retval = NULL; + struct yaffs_dev *retval = NULL; + struct yaffs_dev *dev = NULL; int thisMatchLength; int longestMatch = -1; int matching; - // Check all configs, choose the one that: - // 1) Actually matches a prefix (ie /a amd /abc will not match - // 2) Matches the longest. - while(cfg && cfg->prefix && cfg->dev){ + /* + * Check all configs, choose the one that: + * 1) Actually matches a prefix (ie /a amd /abc will not match + * 2) Matches the longest. + */ + list_for_each(cfg, &yaffsfs_deviceList){ + dev = list_entry(cfg, struct yaffs_dev, dev_list); leftOver = path; - p = cfg->prefix; + p = dev->param.name; thisMatchLength = 0; matching = 1; while(matching && *p && *leftOver){ - // Skip over any /s + /* Skip over any /s */ while(yaffsfs_IsPathDivider(*p)) p++; - // Skip over any /s + /* Skip over any /s */ while(yaffsfs_IsPathDivider(*leftOver)) leftOver++; - // Now match the text part + /* Now match the text part */ while(matching && *p && !yaffsfs_IsPathDivider(*p) && *leftOver && !yaffsfs_IsPathDivider(*leftOver)){ @@ -194,107 +432,112 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) } } - // Skip over any /s in leftOver + /* Skip over any /s in leftOver */ while(yaffsfs_IsPathDivider(*leftOver)) leftOver++; - - if( matching && (thisMatchLength > longestMatch)){ + // Skip over any /s in p + while(yaffsfs_IsPathDivider(*p)) + p++; + + // p should now be at the end of the string (ie. fully matched) + if(*p) + matching = 0; + + if( matching && (thisMatchLength > longestMatch)) + { // Matched prefix *restOfPath = (YCHAR *)leftOver; - retval = cfg->dev; + retval = dev; longestMatch = thisMatchLength; } - cfg++; } return retval; } -#if 0 -static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) +static int yaffsfs_CheckPath(const YCHAR *path) { - yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList; - const YCHAR *leftOver; - const YCHAR *p; - yaffs_Device *retval = NULL; - int thisMatchLength; - int longestMatch = -1; - - // Check all configs, choose the one that: - // 1) Actually matches a prefix (ie /a amd /abc will not match - // 2) Matches the longest. - while(cfg && cfg->prefix && cfg->dev){ - leftOver = path; - p = cfg->prefix; - thisMatchLength = 0; - - while(*p && //unmatched part of prefix - !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && // the rest of the prefix is not / (to catch / at end) - *leftOver && - yaffsfs_Match(*p,*leftOver)){ - p++; - leftOver++; - thisMatchLength++; - } - - - if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) && // end of prefix - (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && // no more in this path name part - (thisMatchLength > longestMatch)){ - // Matched prefix - *restOfPath = (YCHAR *)leftOver; - retval = cfg->dev; - longestMatch = thisMatchLength; - } - cfg++; + int n=0; + int divs=0; + while(*path && n < YAFFS_MAX_NAME_LENGTH && divs < 100){ + if(yaffsfs_IsPathDivider(*path)){ + n=0; + divs++; + } else + n++; + path++; } - return retval; + + return (*path) ? -1 : 0; +} + +/* FindMountPoint only returns a dev entry if the path is a mount point */ +static struct yaffs_dev *yaffsfs_FindMountPoint(const YCHAR *path) +{ + struct yaffs_dev *dev; + YCHAR *restOfPath=NULL; + dev = yaffsfs_FindDevice(path,&restOfPath); + if(dev && restOfPath && *restOfPath) + dev = NULL; + return dev; } -#endif -static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) +static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) { - yaffs_Device *dev; + struct yaffs_dev *dev; dev= yaffsfs_FindDevice(path,restOfPath); - if(dev && dev->isMounted){ - return dev->rootDir; + if(dev && dev->is_mounted){ + return dev->root_dir; } return NULL; } -static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth) +static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj, + int symDepth, int *loop) { - while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){ - YCHAR *alias = obj->variant.symLinkVariant.alias; + if(obj) + obj = yaffs_get_equivalent_obj(obj); + + while(obj && obj->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++); + /* Starts with a /, need to scan from root up */ + obj = yaffsfs_FindObject(NULL,alias,symDepth++, + 1,NULL,NULL,loop); else - // Relative to here, so use the parent of the symlink as a start - obj = yaffsfs_FindObject(obj->parent,alias,symDepth++); + /* Relative to here, so use the parent of the symlink as a start */ + obj = yaffsfs_FindObject(obj->parent,alias,symDepth++, + 1,NULL,NULL,loop); } return obj; } -// yaffsfs_FindDirectory -// Parse a path to determine the directory and the name within the directory. -// -// eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx" -static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR *path,YCHAR **name,int symDepth) +/* + * yaffsfs_FindDirectory + * Parse a path to determine the directory and the name within the directory. + * + * eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx" + */ +static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, + const YCHAR *path, YCHAR **name, int symDepth, + int *notDir,int *loop) { - yaffs_Object *dir; + struct yaffs_obj *dir; YCHAR *restOfPath; YCHAR str[YAFFS_MAX_NAME_LENGTH+1]; int i; - if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES) + if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES){ + if(loop) + *loop = 1; return NULL; + } if(startDir){ dir = startDir; @@ -303,12 +546,15 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR else dir = yaffsfs_FindRoot(path,&restOfPath); + while(dir){ - // parse off /. - // curve ball: also throw away surplus '/' - // eg. "/ram/x////ff" gets treated the same as "/ram/x/ff" + /* + * parse off /. + * curve ball: also throw away surplus '/' + * eg. "/ram/x////ff" gets treated the same as "/ram/x/ff" + */ while(yaffsfs_IsPathDivider(*restOfPath)) - restOfPath++; // get rid of '/' + restOfPath++; /* get rid of '/' */ *name = restOfPath; i = 0; @@ -323,49 +569,69 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR } if(!*restOfPath) - // got to the end of the string + /* got to the end of the string */ return dir; else{ if(yaffs_strcmp(str,_Y(".")) == 0) { - // Do nothing + /* Do nothing */ } else if(yaffs_strcmp(str,_Y("..")) == 0) dir = dir->parent; else{ - dir = yaffs_FindObjectByName(dir,str); - - while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK) - dir = yaffsfs_FollowLink(dir,symDepth); + dir = yaffs_find_by_name(dir,str); + dir = yaffsfs_FollowLink(dir,symDepth,loop); - if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) + if(dir && dir->variant_type != + YAFFS_OBJECT_TYPE_DIRECTORY){ + if(notDir) + *notDir = 1; dir = NULL; + } + } } } - // directory did not exist. + /* directory did not exist. */ return NULL; } -static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,const YCHAR *path,YCHAR **name,int symDepth) +static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relDir, + const YCHAR *path, + YCHAR **name, + int symDepth, + int *notDir, + int *loop) { - return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth); + return yaffsfs_DoFindDirectory(relDir,path,name,symDepth,notDir,loop); } -// 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) +/* + * yaffsfs_FindObject turns a path for an existing object into the object + */ +static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relDir, + const YCHAR *path,int symDepth, int getEquiv, + struct yaffs_obj **dirOut, int *notDir,int *loop) { - yaffs_Object *dir; + struct yaffs_obj *dir; + struct yaffs_obj *obj; YCHAR *name; - dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth); + dir = yaffsfs_FindDirectory(relDir,path,&name,symDepth,notDir,loop); + + if(dirOut) + *dirOut = dir; if(dir && *name) - return yaffs_FindObjectByName(dir,name); + obj = yaffs_find_by_name(dir,name); + else + obj = dir; - return dir; + if(getEquiv) + obj = yaffs_get_equivalent_obj(obj); + + return obj; } @@ -378,8 +644,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); @@ -397,109 +663,214 @@ int yaffs_dup(int fd) } -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; + struct yaffs_obj *obj = NULL; + struct yaffs_obj *dir = NULL; YCHAR *name; int handle = -1; - yaffsfs_Handle *h = NULL; - int alreadyOpen = 0; - int alreadyExclusive = 0; + 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; + u8 sharedWriteAllowed; + u8 alreadyReading; + u8 alreadyWriting; + u8 readRequested; + u8 writeRequested; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } - int i; + /* O_EXCL only has meaning if O_CREAT is specified */ + if(!(oflag & O_CREAT)) + oflag &= ~(O_EXCL); + /* O_TRUNC has no meaning if (O_CREAT | O_EXCL) is specified */ + if( (oflag & O_CREAT) & (oflag & O_EXCL)) + oflag &= ~(O_TRUNC); - // todo sanity check oflag (eg. can't have O_TRUNC without WRONLY or RDWR + /* Todo: Are there any more flag combos to sanitise ? */ + /* Figure out if reading or writing is requested */ - yaffsfs_Lock(); + readRequested = (rwflags == O_RDWR || rwflags == O_RDONLY) ? 1 : 0; + writeRequested = (rwflags == O_RDWR || rwflags == O_WRONLY) ? 1 : 0; - handle = yaffsfs_GetHandle(); + yaffsfs_Lock(); - if(handle >= 0){ + handle = yaffsfs_GetNewHandle(); - h = yaffsfs_GetHandlePointer(handle); + if(handle < 0){ + yaffsfs_SetError(-ENFILE); + errorReported = 1; + } else { + yh = yaffsfs_GetHandlePointer(handle); - // try to find the exisiting object - obj = yaffsfs_FindObject(NULL,path,0); + /* try to find the exisiting object */ + obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL); - if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) - obj = yaffsfs_FollowLink(obj,symDepth++); + obj = yaffsfs_FollowLink(obj,symDepth++,&loop); - if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE) + if(obj && + obj->variant_type != YAFFS_OBJECT_TYPE_FILE && + obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) obj = NULL; + if(obj){ - // Check if the object is already in use - alreadyOpen = alreadyExclusive = 0; - - for(i = 0; i < YAFFSFS_N_HANDLES; i++){ - - if(i != handle && - yaffsfs_handle[i].inUse && - obj == yaffsfs_handle[i].obj){ - alreadyOpen = 1; - if(yaffsfs_handle[i].exclusive) - alreadyExclusive = 1; - } - } - if(((oflag & O_EXCL) && alreadyOpen) || alreadyExclusive) + /* The file already exists or it might be a directory */ + + /* If it is a directory then we can't open it as a file */ + if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ openDenied = 1; + yaffsfs_SetError(-EISDIR); + errorReported = 1; + } - // Open should fail if O_CREAT and O_EXCL are specified - if((oflag & O_EXCL) && (oflag & O_CREAT)){ + /* Open should fail if O_CREAT and O_EXCL are specified since + * the file exists + */ + if(!errorReported && (oflag & O_EXCL) && (oflag & O_CREAT)){ openDenied = 1; yaffsfs_SetError(-EEXIST); errorReported = 1; } - // Check file permissions - if( (oflag & (O_RDWR | O_WRONLY)) == 0 && // ie O_RDONLY - !(obj->yst_mode & S_IREAD)) + /* Check file permissions */ + if( readRequested && !(obj->yst_mode & S_IREAD)) openDenied = 1; - if( (oflag & O_RDWR) && - !(obj->yst_mode & S_IREAD)) + if( writeRequested && !(obj->yst_mode & S_IWRITE)) openDenied = 1; - if( (oflag & (O_RDWR | O_WRONLY)) && - !(obj->yst_mode & S_IWRITE)) + if( !errorReported && writeRequested && + obj->my_dev->read_only){ openDenied = 1; + yaffsfs_SetError(-EROFS); + errorReported = 1; + } + + if(openDenied && !errorReported ) { + /* Error if the file exists but permissions are refused. */ + yaffsfs_SetError(-EACCES); + errorReported = 1; + } + + /* Check sharing of an existing object. */ + if(!openDenied){ + 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 = 1; + } + } + + + + 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); - if(dir) - obj = yaffs_MknodFile(dir,name,mode,0,0); - else { + /* If we could not open an existing object, then let's see if + * the directory exists. If not, error. + */ + if(!obj && !errorReported){ + dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + if(!dir && notDir){ yaffsfs_SetError(-ENOTDIR); errorReported = 1; + } else if(loop){ + yaffsfs_SetError(-ELOOP); + errorReported = 1; + } else if(!dir){ + yaffsfs_SetError(-ENOENT); + errorReported = 1; + } + } + + if(!obj && dir && !errorReported && (oflag & O_CREAT)) { + /* Let's see if we can create this file if it does not exist. */ + if(dir->my_dev->read_only){ + yaffsfs_SetError(-EROFS); + errorReported = 1; + } else + obj = yaffs_create_file(dir,name,mode,0,0); + + if(!obj && !errorReported){ + yaffsfs_SetError(-ENOSPC); + errorReported = 1; } } + if(!obj && dir && !errorReported && !(oflag & O_CREAT)) { + /* Error if the file does not exist and CREAT is not set. */ + yaffsfs_SetError(-ENOENT); + errorReported = 1; + } + if(obj && !openDenied) { - h->obj = obj; - h->inUse = 1; - 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++; - if((oflag & O_TRUNC) && !h->readOnly) - yaffs_ResizeFile(obj,0); + 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. + */ + } + + 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) && yh->writing) + yaffs_resize_file(obj,0); } else { yaffsfs_PutHandle(handle); - if(!errorReported) { - yaffsfs_SetError(-EACCES); - errorReported = 1; - } + if(!errorReported) + yaffsfs_SetError(0); /* Problem */ handle = -1; } } @@ -509,22 +880,31 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) 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; - int retVal = 0; + int retVal = -1; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); - if(h && h->inUse) - // flush the file - yaffs_FlushFile(h->obj,1,datasync); - else { - // bad handle + if(!h || h->useCount < 1) yaffsfs_SetError(-EBADF); - retVal = -1; + else { + struct yaffs_obj * obj; + obj = yaffsfs_inode[h->inodeId].iObj; + if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else { + yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync); + retVal = 0; + } } yaffsfs_Unlock(); @@ -556,17 +936,13 @@ int yaffs_close(int fd) h = yaffsfs_GetHandlePointer(fd); - if(h && h->inUse) { - // clean up - yaffs_FlushFile(h->obj,1,0); - h->obj->inUse--; - if(h->obj->inUse <= 0 && h->obj->unlinked) - yaffs_DeleteObject(h->obj); - + if(h && h->useCount > 0) { + /* clean up */ + yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,0); yaffsfs_PutHandle(fd); retVal = 0; } else { - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); retVal = -1; } @@ -576,26 +952,46 @@ int yaffs_close(int fd) return retVal; } -int yaffs_read(int fd, void *buf, unsigned int nbyte) + + +int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset) { yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *obj = NULL; int pos = 0; - int nRead = -1; + int startPos = 0; + int endPos = 0; + int nRead = 0; + int nToRead = 0; + int totalRead = 0; unsigned int maxRead; + u8 *buf = (u8 *)vbuf; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); obj = yaffsfs_GetHandleObject(fd); - if(!h || !obj) - // bad handle + if(!h || !obj){ + /* bad handle */ yaffsfs_SetError(-EBADF); + totalRead = -1; + } else if(!h->reading){ + /* Not a reading handle */ + yaffsfs_SetError(-EINVAL); + totalRead = -1; + } else if(nbyte > YAFFS_MAX_FILE_SIZE){ + yaffsfs_SetError(-EINVAL); + totalRead = -1; + } else { + if(isPread) + startPos = offset; + else + startPos = h->position; - else if( h && obj){ - pos= h->position; - if(yaffs_GetObjectFileLength(obj) > pos) - maxRead = yaffs_GetObjectFileLength(obj) - pos; + pos = startPos; + + if(yaffs_get_obj_length(obj) > pos) + maxRead = yaffs_get_obj_length(obj) - pos; else maxRead = 0; @@ -603,168 +999,232 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte) nbyte = maxRead; - if(nbyte > 0) { - nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte); - if(nRead >= 0) - h->position = pos + nRead; - else { - //todo error + yaffsfs_GetHandle(fd); + + endPos = pos + nbyte; + + if(pos < 0 || pos > YAFFS_MAX_FILE_SIZE || + nbyte > YAFFS_MAX_FILE_SIZE || + endPos < 0 || endPos > YAFFS_MAX_FILE_SIZE){ + totalRead = -1; + nbyte = 0; + } + + while(nbyte > 0) { + nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); + if(nToRead > nbyte) + nToRead = nbyte; + + /* Tricky bit... + * Need to reverify object in case the device was + * unmounted in another thread. + */ + obj = yaffsfs_GetHandleObject(fd); + if(!obj) + nRead = 0; + else + nRead = yaffs_file_rd(obj,buf,pos,nToRead); + + if(nRead > 0){ + totalRead += nRead; + pos += nRead; + buf += nRead; } - } else - nRead = 0; + + 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 + yaffsfs_SetError(-EINVAL); + } } 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) +{ + return yaffsfs_do_read(fd, buf, nbyte, 1, offset); +} + +int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset) { yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *obj = NULL; int pos = 0; - int nRead = -1; - unsigned int maxRead; + int startPos = 0; + int endPos; + int nWritten = 0; + int totalWritten = 0; + int write_trhrough = 0; + int nToWrite = 0; + const u8 *buf = (const u8 *)vbuf; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); obj = yaffsfs_GetHandleObject(fd); - if(!h || !obj) - // bad handle + if(!h || !obj){ + /* bad handle */ yaffsfs_SetError(-EBADF); - else if( h && obj) { - pos= offset; - if(yaffs_GetObjectFileLength(obj) > pos) - maxRead = yaffs_GetObjectFileLength(obj) - pos; + totalWritten = -1; + } else if(!h->writing){ + yaffsfs_SetError(-EINVAL); + totalWritten=-1; + } else if(obj->my_dev->read_only){ + yaffsfs_SetError(-EROFS); + totalWritten=-1; + } else { + if(h->append) + startPos = yaffs_get_obj_length(obj); + else if(isPwrite) + startPos = offset; else - maxRead = 0; + startPos = h->position; - if(nbyte > maxRead) - nbyte = maxRead; - - - if(nbyte > 0) - nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte); - else - nRead = 0; - } - - yaffsfs_Unlock(); + yaffsfs_GetHandle(fd); + pos = startPos; + endPos = pos + nbyte; + if(pos < 0 || pos > YAFFS_MAX_FILE_SIZE || + nbyte > YAFFS_MAX_FILE_SIZE || + endPos < 0 || endPos > YAFFS_MAX_FILE_SIZE){ + totalWritten = -1; + nbyte = 0; + } - return (nRead >= 0) ? nRead : -1; - -} + while(nbyte > 0) { + + nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); + if(nToWrite > nbyte) + nToWrite = nbyte; + + /* Tricky bit... + * Need to reverify object in case the device was + * remounted or unmounted in another thread. + */ + obj = yaffsfs_GetHandleObject(fd); + if(!obj || obj->my_dev->read_only) + nWritten = 0; + else + nWritten = yaffs_wr_file(obj,buf,pos,nToWrite, + write_trhrough); + if(nWritten > 0){ + totalWritten += nWritten; + pos += nWritten; + buf += nWritten; + } -int yaffs_write(int fd, const void *buf, unsigned int nbyte) -{ - yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; - int pos = 0; - int nWritten = -1; - int writeThrough = 0; + if(nWritten == nToWrite) + nbyte -= nToWrite; + else + nbyte = 0; - yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + if(nWritten < 1 && totalWritten < 1){ + yaffsfs_SetError(-ENOSPC); + totalWritten = -1; + } - if(!h || !obj) - // bad handle - yaffsfs_SetError(-EBADF); - else if( h && obj && h->readOnly){ - // todo error - } else if( h && obj){ - if(h->append) - pos = yaffs_GetObjectFileLength(obj); - else - pos = h->position; + if(nbyte > 0){ + yaffsfs_Unlock(); + yaffsfs_Lock(); + } + } - nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough); + yaffsfs_PutHandle(fd); - if(nWritten >= 0) - h->position = pos + nWritten; - else { - //todo error + if(!isPwrite){ + if(totalWritten > 0) + h->position = startPos + totalWritten; + else + yaffsfs_SetError(-EINVAL); } - } 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); } -int yaffs_truncate(const YCHAR *path,off_t newSize) +int yaffs_truncate(const YCHAR *path,off_t new_size) { - yaffs_Object *obj = NULL; + struct yaffs_obj *obj = NULL; + struct yaffs_obj *dir = NULL; int result = YAFFS_FAIL; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); - if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!obj) + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); - else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE) + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE) yaffsfs_SetError(-EISDIR); + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if(new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE) + yaffsfs_SetError(-EINVAL); else - result = yaffs_ResizeFile(obj,newSize); + result = yaffs_resize_file(obj,new_size); yaffsfs_Unlock(); - return (result) ? 0 : -1; } -int yaffs_ftruncate(int fd, off_t newSize) +int yaffs_ftruncate(int fd, off_t new_size) { yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *obj = NULL; int result = 0; yaffsfs_Lock(); @@ -772,14 +1232,19 @@ int yaffs_ftruncate(int fd, off_t newSize) obj = yaffsfs_GetHandleObject(fd); if(!h || !obj) - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); + else if(!h->writing) + yaffsfs_SetError(-EINVAL); + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if( new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE) + yaffsfs_SetError(-EINVAL); else - // resize the file - result = yaffs_ResizeFile(obj,newSize); + /* resize the file */ + result = yaffs_resize_file(obj,new_size); yaffsfs_Unlock(); - return (result) ? 0 : -1; } @@ -787,7 +1252,7 @@ int yaffs_ftruncate(int fd, off_t newSize) off_t yaffs_lseek(int fd, off_t offset, int whence) { yaffsfs_Handle *h = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *obj = NULL; int pos = -1; int fSize = -1; @@ -796,29 +1261,30 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) obj = yaffsfs_GetHandleObject(fd); if(!h || !obj) - // bad handle yaffsfs_SetError(-EBADF); - else if(whence == SEEK_SET){ - if(offset >= 0) - pos = offset; - } - else if(whence == SEEK_CUR) { - if( (h->position + offset) >= 0) - pos = (h->position + offset); - } - else if(whence == SEEK_END) { - fSize = yaffs_GetObjectFileLength(obj); - if(fSize >= 0 && (fSize + offset) >= 0) - pos = fSize + offset; - } - - if(pos >= 0) - h->position = pos; + else if(offset > YAFFS_MAX_FILE_SIZE) + yaffsfs_SetError(-EINVAL); else { - // todo error + if(whence == SEEK_SET){ + if(offset >= 0) + pos = offset; + } else if(whence == SEEK_CUR) { + if( (h->position + offset) >= 0) + pos = (h->position + offset); + } else if(whence == SEEK_END) { + fSize = yaffs_get_obj_length(obj); + if(fSize >= 0 && (fSize + offset) >= 0) + pos = fSize + offset; + } + + if(pos >= 0 && pos <= YAFFS_MAX_FILE_SIZE) + h->position = pos; + else{ + yaffsfs_SetError(-EINVAL); + pos = -1; + } } - yaffsfs_Unlock(); return pos; @@ -827,25 +1293,43 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) { - yaffs_Object *dir = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *dir = NULL; + struct yaffs_obj *obj = NULL; YCHAR *name; int result = YAFFS_FAIL; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); - dir = yaffsfs_FindDirectory(NULL,path,&name,0); - if(!dir) + obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL,NULL); + dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir) + yaffsfs_SetError(-ENOENT); + else if(yaffs_strncmp(name,_Y("."),2) == 0) + yaffsfs_SetError(-EINVAL); else if(!obj) yaffsfs_SetError(-ENOENT); - else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if(!isDirectory && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) yaffsfs_SetError(-EISDIR); - else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) + else if(isDirectory && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) yaffsfs_SetError(-ENOTDIR); + else if(isDirectory && obj == obj->my_dev->root_dir) + yaffsfs_SetError(-EBUSY); /* Can't rmdir a root */ else { - result = yaffs_Unlink(dir,name); + result = yaffs_unlinker(dir,name); if(result == YAFFS_FAIL && isDirectory) yaffsfs_SetError(-ENOTEMPTY); @@ -853,17 +1337,10 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_Unlock(); - // todo error - return (result == YAFFS_FAIL) ? -1 : 0; } -int yaffs_rmdir(const YCHAR *path) -{ - return yaffsfs_DoUnlink(path,1); -} - int yaffs_unlink(const YCHAR *path) { return yaffsfs_DoUnlink(path,0); @@ -871,114 +1348,472 @@ int yaffs_unlink(const YCHAR *path) int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) { - yaffs_Object *olddir = NULL; - yaffs_Object *newdir = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *olddir = NULL; + struct yaffs_obj *newdir = NULL; + struct yaffs_obj *obj = NULL; + struct yaffs_obj *newobj = NULL; YCHAR *oldname; YCHAR *newname; int result= YAFFS_FAIL; - int renameAllowed = 1; + int rename_allowed = 1; + int notOldDir = 0; + int notNewDir = 0; + int oldLoop = 0; + int newLoop = 0; + + YCHAR *alt_newpath=NULL; + + if(yaffsfs_CheckPath(newPath) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + if(yaffsfs_alt_dir_path(newPath, &alt_newpath) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; + } + if(alt_newpath) + newPath = alt_newpath; yaffsfs_Lock(); - olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0); - newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0); - obj = yaffsfs_FindObject(NULL,oldPath,0); - if(!olddir || !newdir || !obj) { - // bad file - yaffsfs_SetError(-EBADF); - renameAllowed = 0; - } else if(olddir->myDev != newdir->myDev) { - // oops must be on same device - // todo error - yaffsfs_SetError(-EXDEV); - renameAllowed = 0; - } else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) { - // It is a directory, check that it is not being renamed to - // being its own decendent. - // Do this by tracing from the new directory back to the root, checking for obj + olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0,¬OldDir,&oldLoop); + newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,¬NewDir,&newLoop); + obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL,NULL); + newobj = yaffsfs_FindObject(NULL,newPath,0,0,NULL,NULL,NULL); - yaffs_Object *xx = newdir; + /* If the object being renamed is a directory and the + * path ended with a "/" then the olddir == obj. + * We pass through NULL for the old name to tell the lower layers + * to use olddir as the object. + */ - while( renameAllowed && xx){ + if(olddir == obj) + oldname = NULL; + + if((!olddir && notOldDir) || (!newdir && notNewDir)) { + yaffsfs_SetError(-ENOTDIR); + rename_allowed = 0; + } else if(oldLoop || newLoop) { + yaffsfs_SetError(-ELOOP); + rename_allowed = 0; + } else if (olddir && oldname && yaffs_strncmp(oldname, _Y("."),2) == 0){ + yaffsfs_SetError(-EINVAL); + rename_allowed = 0; + }else if(!olddir || !newdir || !obj) { + yaffsfs_SetError(-ENOENT); + rename_allowed = 0; + } else if(obj->my_dev->read_only){ + yaffsfs_SetError(-EROFS); + rename_allowed = 0; + } else if(yaffs_is_non_empty_dir(newobj)){ + yaffsfs_SetError(-ENOTEMPTY); + rename_allowed = 0; + } else if(olddir->my_dev != newdir->my_dev) { + /* Rename must be on same device */ + yaffsfs_SetError(-EXDEV); + rename_allowed = 0; + } else if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) { + /* + * It is a directory, check that it is not being renamed to + * being its own decendent. + * Do this by tracing from the new directory back to the root, + * checking for obj + */ + + struct yaffs_obj *xx = newdir; + + while( rename_allowed && xx){ if(xx == obj) - renameAllowed = 0; + rename_allowed = 0; xx = xx->parent; } - if(!renameAllowed) - yaffsfs_SetError(-EACCES); + if(!rename_allowed) + yaffsfs_SetError(-EINVAL); } - if(renameAllowed) - result = yaffs_RenameObject(olddir,oldname,newdir,newname); + if(rename_allowed) + result = yaffs_rename_obj(olddir,oldname,newdir,newname); yaffsfs_Unlock(); + if(alt_newpath) + YFREE(alt_newpath); + return (result == YAFFS_FAIL) ? -1 : 0; } -static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf) +static int yaffsfs_DoStat(struct yaffs_obj *obj,struct yaffs_stat *buf) { int retVal = -1; - if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if(obj && buf){ - buf->st_dev = (int)obj->myDev->genericDevice; - buf->st_ino = obj->objectId; - buf->st_mode = obj->yst_mode & ~S_IFMT; // clear out file type bits + buf->st_dev = (int)obj->my_dev->os_context; + buf->st_ino = obj->obj_id; + buf->st_mode = obj->yst_mode & ~S_IFMT; /* clear out file type bits */ - if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) + if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) buf->st_mode |= S_IFDIR; - else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) + else if(obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) buf->st_mode |= S_IFLNK; - else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) + else if(obj->variant_type == YAFFS_OBJECT_TYPE_FILE) buf->st_mode |= S_IFREG; - buf->st_nlink = yaffs_GetObjectLinkCount(obj); - buf->st_uid = 0; - buf->st_gid = 0;; - buf->st_rdev = obj->yst_rdev; - buf->st_size = yaffs_GetObjectFileLength(obj); - buf->st_blksize = obj->myDev->nDataBytesPerChunk; - buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize; -#if CONFIG_YAFFS_WINCE - buf->yst_wince_atime[0] = obj->win_atime[0]; - buf->yst_wince_atime[1] = obj->win_atime[1]; - buf->yst_wince_ctime[0] = obj->win_ctime[0]; - buf->yst_wince_ctime[1] = obj->win_ctime[1]; - buf->yst_wince_mtime[0] = obj->win_mtime[0]; - buf->yst_wince_mtime[1] = obj->win_mtime[1]; -#else - buf->yst_atime = obj->yst_atime; - buf->yst_ctime = obj->yst_ctime; - buf->yst_mtime = obj->yst_mtime; -#endif - retVal = 0; - } + buf->st_nlink = yaffs_get_obj_link_count(obj); + buf->st_uid = 0; + buf->st_gid = 0;; + buf->st_rdev = obj->yst_rdev; + buf->st_size = yaffs_get_obj_length(obj); + buf->st_blksize = obj->my_dev->data_bytes_per_chunk; + buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize; +#if CONFIG_YAFFS_WINCE + buf->yst_wince_atime[0] = obj->win_atime[0]; + buf->yst_wince_atime[1] = obj->win_atime[1]; + buf->yst_wince_ctime[0] = obj->win_ctime[0]; + buf->yst_wince_ctime[1] = obj->win_ctime[1]; + buf->yst_wince_mtime[0] = obj->win_mtime[0]; + buf->yst_wince_mtime[1] = obj->win_mtime[1]; +#else + buf->yst_atime = obj->yst_atime; + buf->yst_ctime = obj->yst_ctime; + buf->yst_mtime = obj->yst_mtime; +#endif + retVal = 0; + } + return retVal; +} + +static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat) +{ + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int retVal = -1; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + + if(!doLStat && obj) + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else + retVal = yaffsfs_DoStat(obj,buf); + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf) +{ + return yaffsfs_DoStatOrLStat(path,buf,0); +} + +int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf) +{ + return yaffsfs_DoStatOrLStat(path,buf,1); +} + +int yaffs_fstat(int fd, struct yaffs_stat *buf) +{ + struct yaffs_obj *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj) + retVal = yaffsfs_DoStat(obj,buf); + else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + +#ifndef CONFIG_YAFFS_WINCE +/* xattrib functions */ + + +static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow) +{ + struct yaffs_obj *obj; + struct yaffs_obj *dir; + int notDir = 0; + int loop = 0; + + int retVal = -1; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + + if(follow) + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { + retVal = yaffs_set_xattrib(obj,name,data,size,flags); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags) +{ + return yaffs_do_setxattr(path, name, data, size, flags, 1); +} + +int yaffs_lsetxattr(const YCHAR *path, const char *name, const void *data, int size, int flags) +{ + return yaffs_do_setxattr(path, name, data, size, flags, 0); +} + + + +int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int flags) +{ + struct yaffs_obj *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(!obj) + yaffsfs_SetError(-EBADF); + else { + retVal = yaffs_set_xattrib(obj,name,data,size,flags); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } + + yaffsfs_Unlock(); + + return retVal; +} + +static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow) +{ + struct yaffs_obj *obj; + struct yaffs_obj *dir; + int retVal = -1; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + + if(follow) + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { + retVal = yaffs_get_xattrib(obj,name,data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_getxattr(const YCHAR *path, const char *name, void *data, int size) +{ + return yaffs_do_getxattr( path, name, data, size, 1); +} +int yaffs_lgetxattr(const YCHAR *path, const char *name, void *data, int size) +{ + return yaffs_do_getxattr( path, name, data, size, 0); +} + + + +int yaffs_fgetxattr(int fd, const char *name, void *data, int size) +{ + struct yaffs_obj *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj) { + retVal = yaffs_get_xattrib(obj,name,data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + +static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow) +{ + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int retVal = -1; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + + if(follow) + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { + retVal = yaffs_list_xattrib(obj, data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_listxattr(const YCHAR *path, char *data, int size) +{ + return yaffs_do_listxattr(path, data, size, 1); +} + +int yaffs_llistxattr(const YCHAR *path, char *data, int size) +{ + return yaffs_do_listxattr(path, data, size, 0); +} + +int yaffs_flistxattr(int fd, char *data, int size) +{ + struct yaffs_obj *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj) { + retVal = yaffs_list_xattrib(obj,data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + return retVal; } -static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat) +static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) { - yaffs_Object *obj; - + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int notDir = 0; + int loop = 0; int retVal = -1; + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); - if(!doLStat && obj) - obj = yaffsfs_FollowLink(obj,0); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); - if(obj) - retVal = yaffsfs_DoStat(obj,buf); - else - // todo error not found + if(follow) + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); + else { + retVal = yaffs_remove_xattrib(obj,name); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } yaffsfs_Unlock(); @@ -986,40 +1821,45 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d } -int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf) +int yaffs_removexattr(const YCHAR *path, const char *name) { - return yaffsfs_DoStatOrLStat(path,buf,0); + return yaffs_do_removexattr(path, name, 1); } -int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf) +int yaffs_lremovexattr(const YCHAR *path, const char *name) { - return yaffsfs_DoStatOrLStat(path,buf,1); + return yaffs_do_removexattr(path, name, 0); } -int yaffs_fstat(int fd, struct yaffs_stat *buf) +int yaffs_fremovexattr(int fd, const char *name) { - yaffs_Object *obj; + struct yaffs_obj *obj; int retVal = -1; yaffsfs_Lock(); obj = yaffsfs_GetHandleObject(fd); - if(obj) - retVal = yaffsfs_DoStat(obj,buf); - else - // bad handle + if(obj){ + retVal = yaffs_remove_xattrib(obj,name); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + }else + /* bad handle */ yaffsfs_SetError(-EBADF); yaffsfs_Unlock(); return retVal; } +#endif #ifdef CONFIG_YAFFS_WINCE int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime) { - yaffs_Object *obj; + struct yaffs_obj *obj; int retVal = -1; @@ -1044,7 +1884,7 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned * retVal = 0; } else - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); yaffsfs_Unlock(); @@ -1058,7 +1898,7 @@ int yaffs_set_wince_times(int fd, const unsigned *watime, const unsigned *wmtime) { - yaffs_Object *obj; + struct yaffs_obj *obj; int result; int retVal = -1; @@ -1081,10 +1921,10 @@ int yaffs_set_wince_times(int fd, } obj->dirty = 1; - result = yaffs_FlushFile(obj,0,0); + result = yaffs_flush_file(obj,0,0); retVal = 0; } else - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); yaffsfs_Unlock(); @@ -1095,17 +1935,17 @@ int yaffs_set_wince_times(int fd, #endif -static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode) +static int yaffsfs_DoChMod(struct yaffs_obj *obj,mode_t mode) { int result = -1; if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if(obj) { obj->yst_mode = mode; obj->dirty = 1; - result = yaffs_FlushFile(obj,0,0); + result = yaffs_flush_file(obj,0,0); } return result == YAFFS_OK ? 0 : -1; @@ -1114,14 +1954,36 @@ static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode) int yaffs_access(const YCHAR *path, int amode) { - yaffs_Object *obj; + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int notDir = 0; + int loop = 0; + int retval = -1; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } - int retval = 0; + if(amode & ~(R_OK | W_OK | X_OK)){ + yaffsfs_SetError(-EINVAL); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); - if(obj) { + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else if((amode & W_OK) && obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else{ int access_ok = 1; if((amode & R_OK) && !(obj->yst_mode & S_IREAD)) @@ -1131,14 +1993,10 @@ int yaffs_access(const YCHAR *path, int amode) if((amode & X_OK) && !(obj->yst_mode & S_IEXEC)) access_ok = 0; - if(!access_ok) { + if(!access_ok) yaffsfs_SetError(-EACCES); - retval = -1; - } - } else { - // todo error not found - yaffsfs_SetError(-ENOENT); - retval = -1; + else + retval = 0; } yaffsfs_Unlock(); @@ -1150,18 +2008,37 @@ int yaffs_access(const YCHAR *path, int amode) int yaffs_chmod(const YCHAR *path, mode_t mode) { - yaffs_Object *obj; - + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; int retVal = -1; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + if(mode & ~(0777)){ + yaffsfs_SetError(-EINVAL); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); - if(obj) - retVal = yaffsfs_DoChMod(obj,mode); - else - // todo error not found + obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else + retVal = yaffsfs_DoChMod(obj,mode); yaffsfs_Unlock(); @@ -1172,78 +2049,143 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) int yaffs_fchmod(int fd, mode_t mode) { - yaffs_Object *obj; - + struct yaffs_obj *obj; int retVal = -1; + if(mode & ~(0777)){ + yaffsfs_SetError(-EINVAL); + return -1; + } + yaffsfs_Lock(); obj = yaffsfs_GetHandleObject(fd); - if(obj) - retVal = yaffsfs_DoChMod(obj,mode); - else - // bad handle + if(!obj) yaffsfs_SetError(-EBADF); + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else + retVal = yaffsfs_DoChMod(obj,mode); yaffsfs_Unlock(); return retVal; } - int yaffs_mkdir(const YCHAR *path, mode_t mode) { - yaffs_Object *parent = NULL; - yaffs_Object *dir = NULL; + struct yaffs_obj *parent = NULL; + struct yaffs_obj *dir = NULL; YCHAR *name; + YCHAR *alt_path = NULL; int retVal= -1; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + if(yaffsfs_alt_dir_path(path, &alt_path) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; + } + if(alt_path) + path = alt_path; + yaffsfs_Lock(); - parent = yaffsfs_FindDirectory(NULL,path,&name,0); - if(parent) - dir = yaffs_MknodDirectory(parent,name,mode,0,0); - if(dir) - retVal = 0; + parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + if(!parent && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!parent) + yaffsfs_SetError(-ENOENT); + else if(yaffs_strnlen(name,5) == 0){ + /* Trying to make the root itself */ + yaffsfs_SetError(-EEXIST); + } else if(parent->my_dev->read_only) + yaffsfs_SetError(-EROFS); else { - if(!parent) - yaffsfs_SetError(-ENOENT); // missing path - else if (yaffs_FindObjectByName(parent,name)) - yaffsfs_SetError(-EEXIST); // the name already exists + dir = yaffs_create_dir(parent,name,mode,0,0); + if(dir) + retVal = 0; + else if (yaffs_find_by_name(parent,name)) + yaffsfs_SetError(-EEXIST); /* the name already exists */ else - yaffsfs_SetError(-ENOSPC); // just assume no space - retVal = -1; + yaffsfs_SetError(-ENOSPC); /* just assume no space */ } yaffsfs_Unlock(); + if(alt_path) + YFREE(alt_path); + return retVal; } -int yaffs_mount(const YCHAR *path) +int yaffs_rmdir(const YCHAR *path) +{ + int result; + YCHAR *alt_path; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + if(yaffsfs_alt_dir_path(path, &alt_path) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; + } + if(alt_path) + path = alt_path; + result = yaffsfs_DoUnlink(path,1); + if(alt_path) + YFREE(alt_path); + return result; +} + + +void * yaffs_getdev(const YCHAR *path) +{ + struct yaffs_dev *dev=NULL; + YCHAR *dummy; + dev = yaffsfs_FindDevice(path,&dummy); + return (void *)dev; +} + +int yaffs_mount2(const YCHAR *path,int read_only) { int retVal=-1; int result=YAFFS_FAIL; - yaffs_Device *dev=NULL; - YCHAR *dummy; + struct yaffs_dev *dev=NULL; + + T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path)); - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path)); + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + + yaffsfs_InitHandles(); + + dev = yaffsfs_FindMountPoint(path); if(dev){ - if(!dev->isMounted){ - result = yaffs_GutsInitialise(dev); + if(!dev->is_mounted){ + dev->read_only = read_only ? 1 : 0; + result = yaffs_guts_initialise(dev); if(result == YAFFS_FAIL) - // todo error - mount failed yaffsfs_SetError(-ENOMEM); retVal = result ? 0 : -1; } else - //todo error - already mounted. yaffsfs_SetError(-EBUSY); } else - // todo error - no device yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1251,27 +2193,37 @@ int yaffs_mount(const YCHAR *path) } +int yaffs_mount(const YCHAR *path) +{ + return yaffs_mount2(path,0); +} + int yaffs_sync(const YCHAR *path) { int retVal=-1; - yaffs_Device *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev){ - if(dev->isMounted){ - - yaffs_FlushEntireDeviceCache(dev); - yaffs_CheckpointSave(dev); - + if(!dev->is_mounted) + yaffsfs_SetError(-EINVAL); + else if(dev->read_only) + yaffsfs_SetError(-EROFS); + else { - } else - //todo error - not mounted. - yaffsfs_SetError(-EINVAL); + yaffs_flush_whole_cache(dev); + yaffs_checkpoint_save(dev); + retVal = 0; + } }else - // todo error - no device yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1279,42 +2231,46 @@ int yaffs_sync(const YCHAR *path) } -int yaffs_unmount(const YCHAR *path) +int yaffs_remount(const YCHAR *path, int force, int read_only) { int retVal=-1; - yaffs_Device *dev=NULL; - YCHAR *dummy; + struct yaffs_dev *dev=NULL; + yaffsfs_Handle *yh; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ - if(dev->isMounted){ + if(dev->is_mounted){ int i; int inUse; - yaffs_FlushEntireDeviceCache(dev); - yaffs_CheckpointSave(dev); + yaffs_flush_whole_cache(dev); - for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ - if(yaffsfs_handle[i].inUse && yaffsfs_handle[i].obj->myDev == dev) - inUse = 1; // the device is in use, can't unmount + for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){ + yh = & yaffsfs_handle[i]; + if(yh->useCount>0 && + yaffsfs_inode[yh->inodeId].iObj->my_dev == dev) + inUse = 1; /* the device is in use, can't unmount */ } - if(!inUse){ - yaffs_Deinitialise(dev); - + if(!inUse || force){ + if(read_only) + yaffs_checkpoint_save(dev); + dev->read_only = read_only ? 1 : 0; retVal = 0; } else - // todo error can't unmount as files are open yaffsfs_SetError(-EBUSY); } else - //todo error - not mounted. yaffsfs_SetError(-EINVAL); } else - // todo error - no device yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1322,17 +2278,73 @@ int yaffs_unmount(const YCHAR *path) } +int yaffs_unmount2(const YCHAR *path, int force) +{ + int retVal=-1; + struct yaffs_dev *dev=NULL; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + dev = yaffsfs_FindMountPoint(path); + if(dev){ + if(dev->is_mounted){ + int i; + int inUse; + + yaffs_flush_whole_cache(dev); + yaffs_checkpoint_save(dev); + + for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ + if(yaffsfs_handle[i].useCount > 0 && + yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev) + inUse = 1; /* the device is in use, can't unmount */ + } + + if(!inUse || force){ + if(inUse) + yaffsfs_BreakDeviceHandles(dev); + yaffs_deinitialise(dev); + + retVal = 0; + } else + yaffsfs_SetError(-EBUSY); + + } else + yaffsfs_SetError(-EINVAL); + + } else + yaffsfs_SetError(-ENODEV); + + yaffsfs_Unlock(); + return retVal; + +} + +int yaffs_unmount(const YCHAR *path) +{ + return yaffs_unmount2(path,0); +} + loff_t yaffs_freespace(const YCHAR *path) { loff_t retVal=-1; - yaffs_Device *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); - if(dev && dev->isMounted){ - retVal = yaffs_GetNumberOfFreeChunks(dev); - retVal *= dev->nDataBytesPerChunk; + if(dev && dev->is_mounted){ + retVal = yaffs_get_n_free_chunks(dev); + retVal *= dev->data_bytes_per_chunk; } else yaffsfs_SetError(-EINVAL); @@ -1344,15 +2356,21 @@ loff_t yaffs_freespace(const YCHAR *path) loff_t yaffs_totalspace(const YCHAR *path) { loff_t retVal=-1; - yaffs_Device *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); - if(dev && dev->isMounted){ - retVal = (dev->endBlock - dev->startBlock + 1) - dev->nReservedBlocks; - retVal *= dev->nChunksPerBlock; - retVal *= dev->nDataBytesPerChunk; + if(dev && dev->is_mounted){ + retVal = (dev->param.end_block - dev->param.start_block + 1) - + dev->param.n_reserved_blocks; + retVal *= dev->param.chunks_per_block; + retVal *= dev->data_bytes_per_chunk; } else yaffsfs_SetError(-EINVAL); @@ -1364,15 +2382,20 @@ loff_t yaffs_totalspace(const YCHAR *path) int yaffs_inodecount(const YCHAR *path) { loff_t retVal= -1; - yaffs_Device *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); - if(dev && dev->isMounted) { - int nObjects = dev->nObjectsCreated - dev->nFreeObjects; - if(nObjects > dev->nHardLinks) - retVal = nObjects - dev->nHardLinks; + if(dev && dev->is_mounted) { + int n_obj = dev->n_obj; + if(n_obj > dev->n_hardlinks) + retVal = n_obj - dev->n_hardlinks; } if(retVal < 0) @@ -1383,66 +2406,63 @@ int yaffs_inodecount(const YCHAR *path) } - -void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList) +void yaffs_add_device(struct yaffs_dev *dev) { + dev->is_mounted = 0; + dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback; - yaffsfs_DeviceConfiguration *cfg; - - yaffsfs_configurationList = cfgList; + if(!dev->dev_list.next) + INIT_LIST_HEAD(&dev->dev_list); - yaffsfs_InitHandles(); - - cfg = yaffsfs_configurationList; + list_add(&dev->dev_list,&yaffsfs_deviceList); +} - while(cfg && cfg->prefix && cfg->dev){ - cfg->dev->isMounted = 0; - cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback; - cfg++; - } +void yaffs_remove_device(struct yaffs_dev *dev) +{ + list_del_init(&dev->dev_list); +} -} -// -// Directory search stuff. +/* Directory search stuff. */ -// -// Directory search context -// -// NB this is an opaque structure. +/* + * Directory search context + * + * NB this is an opaque structure. + */ typedef struct { - __u32 magic; + u32 magic; yaffs_dirent de; /* directory entry being used by this dsc */ YCHAR name[NAME_MAX+1]; /* name of directory being searched */ - yaffs_Object *dirObj; /* ptr to directory being searched */ - yaffs_Object *nextReturn; /* obj to be returned by next readddir */ + struct yaffs_obj *dirObj; /* ptr to directory being searched */ + struct yaffs_obj *nextReturn; /* obj to be returned by next readddir */ int offset; - struct ylist_head others; + struct list_head others; } yaffsfs_DirectorySearchContext; -static struct ylist_head search_contexts; +static struct list_head search_contexts; static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc) { if(dsc && dsc->dirObj && - dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){ + dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ dsc->offset = 0; - if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children)) + if( list_empty(&dsc->dirObj->variant.dir_variant.children)) dsc->nextReturn = NULL; else - dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next, - yaffs_Object,siblings); + dsc->nextReturn = list_entry(dsc->dirObj->variant.dir_variant.children.next, + struct yaffs_obj,siblings); } else { /* Hey someone isn't playing nice! */ } @@ -1452,28 +2472,28 @@ static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc) { if(dsc && dsc->dirObj && - dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){ + dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ if( dsc->nextReturn == NULL || - ylist_empty(&dsc->dirObj->variant.directoryVariant.children)) + list_empty(&dsc->dirObj->variant.dir_variant.children)) dsc->nextReturn = NULL; else { - struct ylist_head *next = dsc->nextReturn->siblings.next; + struct list_head *next = dsc->nextReturn->siblings.next; - if( next == &dsc->dirObj->variant.directoryVariant.children) + if( next == &dsc->dirObj->variant.dir_variant.children) dsc->nextReturn = NULL; /* end of list */ else - dsc->nextReturn = ylist_entry(next,yaffs_Object,siblings); + dsc->nextReturn = list_entry(next,struct yaffs_obj,siblings); } } else { /* Hey someone isn't playing nice! */ } } -static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj) +static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj) { - struct ylist_head *i; + struct list_head *i; yaffsfs_DirectorySearchContext *dsc; /* if search contexts not initilised then skip */ @@ -1484,9 +2504,9 @@ static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj) * If any are the one being removed, then advance the dsc to * the next one to prevent a hanging ptr. */ - ylist_for_each(i, &search_contexts) { + list_for_each(i, &search_contexts) { if (i) { - dsc = ylist_entry(i, yaffsfs_DirectorySearchContext,others); + dsc = list_entry(i, yaffsfs_DirectorySearchContext,others); if(dsc->nextReturn == obj) yaffsfs_DirAdvance(dsc); } @@ -1497,14 +2517,29 @@ static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj) yaffs_DIR *yaffs_opendir(const YCHAR *dirname) { yaffs_DIR *dir = NULL; - yaffs_Object *obj = NULL; + struct yaffs_obj *obj = NULL; yaffsfs_DirectorySearchContext *dsc = NULL; + int notDir = 0; + int loop = 0; + + if(yaffsfs_CheckPath(dirname) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return NULL; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,dirname,0); + obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,¬Dir,&loop); - if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){ + if(!obj && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!obj) + yaffsfs_SetError(-ENOENT); + else if(obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) + yaffsfs_SetError(-ENOTDIR); + else { dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext)); dir = (yaffs_DIR *)dsc; @@ -1514,12 +2549,12 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) dsc->magic = YAFFS_MAGIC; dsc->dirObj = obj; yaffs_strncpy(dsc->name,dirname,NAME_MAX); - YINIT_LIST_HEAD(&dsc->others); + INIT_LIST_HEAD(&dsc->others); if(!search_contexts.next) - YINIT_LIST_HEAD(&search_contexts); + INIT_LIST_HEAD(&search_contexts); - ylist_add(&dsc->others,&search_contexts); + list_add(&dsc->others,&search_contexts); yaffsfs_SetDirRewound(dsc); } @@ -1540,13 +2575,13 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) if(dsc && dsc->magic == YAFFS_MAGIC){ yaffsfs_SetError(0); if(dsc->nextReturn){ - dsc->de.d_ino = yaffs_GetEquivalentObject(dsc->nextReturn)->objectId; + dsc->de.d_ino = yaffs_get_equivalent_obj(dsc->nextReturn)->obj_id; dsc->de.d_dont_use = (unsigned)dsc->nextReturn; dsc->de.d_off = dsc->offset++; - yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX); + yaffs_get_obj_name(dsc->nextReturn,dsc->de.d_name,NAME_MAX); if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0) { - // this should not happen! + /* this should not happen! */ yaffs_strcpy(dsc->de.d_name,_Y("zz")); } dsc->de.d_reclen = sizeof(struct yaffs_dirent); @@ -1582,36 +2617,47 @@ int yaffs_closedir(yaffs_DIR *dirp) yaffsfs_Lock(); dsc->magic = 0; - ylist_del(&dsc->others); /* unhook from list */ + list_del(&dsc->others); /* unhook from list */ YFREE(dsc); yaffsfs_Unlock(); return 0; } -// end of directory stuff +/* End of directory stuff */ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) { - yaffs_Object *parent = NULL; - yaffs_Object *obj; + struct yaffs_obj *parent = NULL; + struct yaffs_obj *obj; YCHAR *name; int retVal= -1; - int mode = 0; // ignore for now + int mode = 0; /* ignore for now */ + int notDir = 0; + int loop = 0; + if(yaffsfs_CheckPath(newpath) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - parent = yaffsfs_FindDirectory(NULL,newpath,&name,0); - if(parent){ - obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath); + parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,¬Dir,&loop); + if(!parent && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if( !parent || yaffs_strnlen(name,5) < 1) + yaffsfs_SetError(-ENOENT); + else if(parent->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if(parent){ + obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath); if(obj) retVal = 0; - else{ - yaffsfs_SetError(-ENOSPC); // just assume no space for now - retVal = -1; - } - } else { - yaffsfs_SetError(-EINVAL); - retVal = -1; + else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL,NULL,NULL)) + yaffsfs_SetError(-EEXIST); + else + yaffsfs_SetError(-ENOSPC); } yaffsfs_Unlock(); @@ -1622,22 +2668,26 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) { - yaffs_Object *obj = NULL; - int retVal; - + struct yaffs_obj *obj = NULL; + struct yaffs_obj *dir = NULL; + int retVal= -1; + int notDir = 0; + int loop = 0; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); - if(!obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); - retVal = -1; - } else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK) { + else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) yaffsfs_SetError(-EINVAL); - retVal = -1; - } else { - YCHAR *alias = obj->variant.symLinkVariant.alias; + else { + YCHAR *alias = obj->variant.symlink_variant.alias; memset(buf,0,bufsiz); yaffs_strncpy(buf,alias,bufsiz - 1); retVal = 0; @@ -1646,61 +2696,54 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) return retVal; } -int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) +int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath) { - // Creates a link called newpath to existing oldpath - yaffs_Object *obj = NULL; - yaffs_Object *target = NULL; - int retVal = 0; - int newNameLength = 0; + /* Creates a link called newpath to existing oldpath */ + struct yaffs_obj *obj = NULL; + struct yaffs_obj *lnk = NULL; + struct yaffs_obj *obj_dir = NULL; + struct yaffs_obj *lnk_dir = NULL; + int retVal = -1; + int notDirObj = 0; + int notDirLnk = 0; + int objLoop = 0; + int lnkLoop = 0; + YCHAR *newname; + if(yaffsfs_CheckPath(linkpath) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,oldpath,0); - target = yaffsfs_FindObject(NULL,newpath,0); + obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir,¬DirObj,&objLoop); + lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL,NULL); + lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,¬DirLnk,&lnkLoop); - if(!obj) { + if((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk)) + yaffsfs_SetError(-ENOTDIR); + else if(objLoop || lnkLoop) + yaffsfs_SetError(-ELOOP); + else if(!obj_dir || !lnk_dir || !obj) yaffsfs_SetError(-ENOENT); - retVal = -1; - } else if(target) { + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if(lnk) yaffsfs_SetError(-EEXIST); - retVal = -1; - } else { - yaffs_Object *newdir = NULL; - yaffs_Object *link = NULL; - - YCHAR *newname; - - newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0); - - if(!newdir){ - yaffsfs_SetError(-ENOTDIR); - retVal = -1; - }else if(newdir->myDev != obj->myDev){ - yaffsfs_SetError(-EXDEV); - retVal = -1; - } - - 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; - } + else if(lnk_dir->my_dev != obj->my_dev) + yaffsfs_SetError(-EXDEV); + else { + retVal = yaffsfs_CheckNameLength(newname); if(retVal == 0) { - link = yaffs_Link(newdir,newname,obj); - if(link) + lnk = yaffs_link_obj(lnk_dir,newname,obj); + if(lnk) retVal = 0; else{ yaffsfs_SetError(-ENOSPC); retVal = -1; } - } } yaffsfs_Unlock(); @@ -1710,31 +2753,75 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev) { + pathname=pathname; + mode=mode; + dev=dev; + + yaffsfs_SetError(-EINVAL); return -1; } -int yaffs_DumpDevStruct(const YCHAR *path) + +/* + * D E B U G F U N C T I O N S + */ + +/* + * yaffs_n_handles() + * Returns number of handles attached to the object + */ +int yaffs_n_handles(const YCHAR *path) +{ + struct yaffs_obj *obj; + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL); + + if(obj) + return yaffsfs_CountHandles(obj); + else + return -1; +} + +int yaffs_get_error(void) { -#if 0 + return yaffsfs_GetLastError(); +} + +int yaffs_set_error(int error) +{ + yaffsfs_SetError(error); + return 0; +} + +int yaffs_dump_dev(const YCHAR *path) +{ +#if 1 + path=path; +#else YCHAR *rest; - yaffs_Object *obj = yaffsfs_FindRoot(path,&rest); + struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest); if(obj){ - yaffs_Device *dev = obj->myDev; + struct yaffs_dev *dev = obj->my_dev; printf("\n" - "nPageWrites.......... %d\n" - "nPageReads........... %d\n" - "nBlockErasures....... %d\n" - "nGCCopies............ %d\n" + "n_page_writes.......... %d\n" + "n_page_reads........... %d\n" + "n_erasures....... %d\n" + "n_gc_copies............ %d\n" "garbageCollections... %d\n" "passiveGarbageColl'ns %d\n" "\n", - dev->nPageWrites, - dev->nPageReads, - dev->nBlockErasures, - dev->nGCCopies, + dev->n_page_writes, + dev->n_page_reads, + dev->n_erasures, + dev->n_gc_copies, dev->garbageCollections, dev->passiveGarbageCollections );