#include "yportenv.h"
#include "yaffs_trace.h"
-#include <string.h> // for memset
+#include <string.h> /* for memset */
#define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5
#define YAFFSFS_RW_SHIFT (13)
#define YAFFSFS_RW_SIZE (1<<YAFFSFS_RW_SHIFT)
-
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.35 2010-02-25 22:38:03 charles Exp $";
-
-// configurationList is the list of devices that are supported
-static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
-
-
/* Some forward references */
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
-static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
-
-
-// Handle management.
-//
-
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
+ const YCHAR *path, int symDepth, int getEquiv);
+static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
unsigned int yaffs_wr_attempts;
+/*
+ * Handle management.
+ * There are open inodes in yaffsfs_Inode.
+ * There are open handles in yaffsfs_Handle.
+ *
+ * Things are structured this way to be like the Linux VFS model
+ * so that interactions with the yaffs guts calls are similar.
+ * That means more common code paths and less special code.
+ * That means better testing etc.
+ */
+
typedef struct {
- int count;
- yaffs_Object *iObj;
+ int count; /* Number of handles accessing this inode */
+ struct yaffs_obj *iObj;
} yaffsfs_Inode;
typedef struct{
- __u8 readOnly:1; // this handle is read only
- __u8 append:1; // append only
- __u8 exclusive:1; // exclusive
- int inodeId:13; // the object
- int useCount:16; // Use count for this handle
- __u32 position; // current position in file
+ u8 reading:1;
+ u8 writing:1;
+ u8 append:1;
+ 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;
static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
+static int yaffsfs_handlesInitialised;
+
+
+unsigned yaffs_set_trace(unsigned tm)
+{
+ yaffs_trace_mask = tm;
+ return yaffs_trace_mask;
+}
+
+unsigned yaffs_get_trace(void)
+{
+ return yaffs_trace_mask;
+}
+
+/*
+ * yaffsfs_InitHandle
+ * Inilitalise handle management on start-up.
+ */
-// yaffsfs_InitHandle
-/// Inilitalise handles on start-up.
-//
-static int yaffsfs_InitHandles(void)
+static void yaffsfs_InitHandles(void)
{
int i;
+ if(yaffsfs_handlesInitialised)
+ return;
+
memset(yaffsfs_inode,0,sizeof(yaffsfs_inode));
memset(yaffsfs_handle,0,sizeof(yaffsfs_handle));
for(i = 0; i < YAFFSFS_N_HANDLES; i++)
yaffsfs_handle[i].inodeId = -1;
-
- return 0;
}
yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
return NULL;
}
-yaffs_Object *yaffsfs_GetHandleObject(int handle)
+struct yaffs_obj *yaffsfs_GetHandleObject(int handle)
{
yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle);
return NULL;
}
-//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(struct yaffs_obj *obj)
{
int i;
int ret = -1;
- yaffsfs_Inode *in = NULL;
if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffs_get_equivalent_obj(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(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)
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)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
obj = in->iObj;
if(obj->unlinked)
- yaffs_DeleteObject(obj);
+ yaffs_del_obj(obj);
- obj->myInode = NULL;
+ obj->my_inode = NULL;
in->iObj = NULL;
}
}
-//yaffsfs_GetHandle
-// Grab a handle (when opening a file)
-//
+/*
+ * yaffsfs_GetHandle
+ * Grab a handle (when opening a file)
+ */
static int yaffsfs_GetNewHandle(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->useCount < 1){
memset(h,0,sizeof(yaffsfs_Handle));
return -1;
}
-// yaffs_GetHandle
-// Increase use of handle when reading/writing 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);
return 0;
}
-// yaffs_PutHandle
-// Let go of a handle when closing a file or aborting an open or
-// ending a read or write.
-//
+/*
+ * 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);
return 0;
}
+static void yaffsfs_PutDeviceHandles(struct yaffs_dev *dev)
+{
+ yaffsfs_Handle *yh;
+ int i;
+ for(i = 0; i < YAFFSFS_N_HANDLES; i++){
+ yh = & yaffsfs_handle[i];
+ if(yh->useCount>0 &&
+ yaffsfs_inode[yh->inodeId].iObj->my_dev == dev)
+ yaffsfs_PutHandle(i);
+ }
+}
-// 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)
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)
{
- yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
+ 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;
+}
+
+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)
+{
+ 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)){
}
}
- // 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)
+/* FindMountPoint only returns a dev entry if the path is a mount point */
+static struct yaffs_dev *yaffsfs_FindMountPoint(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++;
- }
- return retval;
+ 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)
{
- 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);
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);
}
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)
{
- yaffs_Object *dir;
+ struct yaffs_obj *dir;
YCHAR *restOfPath;
YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
int i;
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;
}
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);
- if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+ if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
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 *relativeDirectory,
+ const YCHAR *path,YCHAR **name,int symDepth)
{
return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth);
}
-// 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 *relativeDirectory, const YCHAR *path,int symDepth, int getEquiv)
{
- yaffs_Object *dir;
+ struct yaffs_obj *dir;
+ struct yaffs_obj *obj;
YCHAR *name;
dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
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;
}
}
-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 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: Are there any more flag combos to sanitise ? */
- // todo sanity check oflag (eg. can't have O_TRUNC without WRONLY or RDWR
+ /* 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){
-
- h = yaffsfs_GetHandlePointer(handle);
-
+ if(handle < 0){
+ yaffsfs_SetError(-ENFILE);
+ errorReported = 1;
+ } else {
- // try to find the exisiting object
- obj = yaffsfs_FindObject(NULL,path,0);
+ yh = yaffsfs_GetHandlePointer(handle);
- if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- obj = yaffsfs_FollowLink(obj,symDepth++);
+ /* try to find the exisiting object */
+ 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)
+ 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].useCount > 0 &&
- obj == yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj){
- 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))
- openDenied = 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
+ /* 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);
- if(dir && dir->myDev->readOnly){
+ if(!dir){
+ yaffsfs_SetError(-ENOTDIR);
+ 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(-EINVAL);
errorReported = 1;
- } else if(dir)
- obj = yaffs_MknodFile(dir,name,mode,0,0);
- else {
- yaffsfs_SetError(-ENOTDIR);
+ } 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) {
int inodeId = yaffsfs_GetInodeIdForObject(obj);
*/
}
- h->inodeId = inodeId;
- h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1;
- h->append = (oflag & O_APPEND) ? 1 : 0;
- h->exclusive = (oflag & O_EXCL) ? 1 : 0;
- h->position = 0;
+ 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->myInode = (void*) &yaffsfs_inode[inodeId];
+ obj->my_inode = (void*) &yaffsfs_inode[inodeId];
- if((oflag & O_TRUNC) && !h->readOnly)
- yaffs_ResizeFile(obj,0);
+ 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;
}
}
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;
h = yaffsfs_GetHandlePointer(fd);
if(h && h->useCount > 0)
- // flush the file
- yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync);
+ /* flush the file */
+ yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
else {
- // bad handle
+ /* bad handle */
yaffsfs_SetError(-EBADF);
retVal = -1;
}
h = yaffsfs_GetHandlePointer(fd);
if(h && h->useCount > 0) {
- // clean up
- yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,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;
}
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 startPos = 0;
int nRead = 0;
int nToRead = 0;
int totalRead = 0;
unsigned int maxRead;
- __u8 *buf = (__u8 *)vbuf;
+ u8 *buf = (u8 *)vbuf;
yaffsfs_Lock();
h = yaffsfs_GetHandlePointer(fd);
obj = yaffsfs_GetHandleObject(fd);
if(!h || !obj){
- // bad handle
+ /* 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
pos = startPos;
- if(yaffs_GetObjectFileLength(obj) > pos)
- maxRead = yaffs_GetObjectFileLength(obj) - pos;
+ if(yaffs_get_obj_length(obj) > pos)
+ maxRead = yaffs_get_obj_length(obj) - pos;
else
maxRead = 0;
nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
if(nToRead > nbyte)
nToRead = nbyte;
- nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead);
+
+ /* 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;
if(totalRead >= 0)
h->position = startPos + totalRead;
else {
- //todo error
+ /* todo error */
}
}
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 startPos = 0;
int nWritten = 0;
int totalWritten = 0;
- int writeThrough = 0;
+ int write_trhrough = 0;
int nToWrite = 0;
- const __u8 *buf = (const __u8 *)vbuf;
+ const u8 *buf = (const u8 *)vbuf;
yaffsfs_Lock();
h = yaffsfs_GetHandlePointer(fd);
obj = yaffsfs_GetHandleObject(fd);
if(!h || !obj){
- // bad handle
+ /* bad handle */
yaffsfs_SetError(-EBADF);
totalWritten = -1;
- } else if( h && obj && (h->readOnly || obj->myDev->readOnly)){
+ } else if( h && obj && (!h->writing || obj->my_dev->read_only)){
yaffsfs_SetError(-EINVAL);
totalWritten=-1;
- } else if( h && obj){
- if(isPwrite)
- startPos = offset;
+ } else {
if(h->append)
- startPos = yaffs_GetObjectFileLength(obj);
+ startPos = yaffs_get_obj_length(obj);
+ else if(isPwrite)
+ startPos = offset;
else
startPos = h->position;
yaffsfs_GetHandle(fd);
pos = startPos;
while(nbyte > 0) {
+
nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
if(nToWrite > nbyte)
nToWrite = nbyte;
- nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough);
+ /* 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;
if(totalWritten > 0)
h->position = startPos + totalWritten;
else {
- //todo error
+ /* todo error */
}
}
}
}
-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;
int result = YAFFS_FAIL;
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);
- else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+ else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
+ yaffsfs_SetError(-EACCES);
+ 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();
obj = yaffsfs_GetHandleObject(fd);
if(!h || !obj)
- // bad handle
+ /* bad handle */
yaffsfs_SetError(-EBADF);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
+ yaffsfs_SetError(-EACCES);
+ 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;
}
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;
h = yaffsfs_GetHandlePointer(fd);
obj = yaffsfs_GetHandleObject(fd);
- if(!h || !obj)
- // bad handle
+ 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 {
- // todo error
+ } 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_get_obj_length(obj);
+ if(fSize >= 0 && (fSize + offset) >= 0)
+ pos = fSize + offset;
+ }
+
+ if(pos >= 0)
+ h->position = pos;
+ else
+ yaffsfs_SetError(-EINVAL);
}
-
yaffsfs_Unlock();
return pos;
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;
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);
else if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
- else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+ 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 {
- result = yaffs_Unlink(dir,name);
+ result = yaffs_unlinker(dir,name);
if(result == YAFFS_FAIL && isDirectory)
yaffsfs_SetError(-ENOTEMPTY);
yaffsfs_Unlock();
- // todo error
+ /* todo error */
return (result == YAFFS_FAIL) ? -1 : 0;
}
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;
YCHAR *oldname;
YCHAR *newname;
int result= YAFFS_FAIL;
- int renameAllowed = 1;
+ int rename_allowed = 1;
yaffsfs_Lock();
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
+ /* bad file */
yaffsfs_SetError(-EBADF);
- renameAllowed = 0;
- } else if(obj->myDev->readOnly){
+ rename_allowed = 0;
+ } else if(obj->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
- renameAllowed = 0;
- } else if(olddir->myDev != newdir->myDev) {
- // oops must be on same device
- // todo error
+ rename_allowed = 0;
+ } else if(olddir->my_dev != newdir->my_dev) {
+ /* Rename must be on same device */
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
+ 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
+ */
- yaffs_Object *xx = newdir;
+ struct yaffs_obj *xx = newdir;
- while( renameAllowed && xx){
+ while( rename_allowed && xx){
if(xx == obj)
- renameAllowed = 0;
+ rename_allowed = 0;
xx = xx->parent;
}
- if(!renameAllowed)
+ if(!rename_allowed)
yaffsfs_SetError(-EACCES);
}
- if(renameAllowed)
- result = yaffs_RenameObject(olddir,oldname,newdir,newname);
+ if(rename_allowed)
+ result = yaffs_rename_obj(olddir,oldname,newdir,newname);
yaffsfs_Unlock();
}
-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->context;
- 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_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_GetObjectFileLength(obj);
- buf->st_blksize = obj->myDev->nDataBytesPerChunk;
+ 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];
static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
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);
if(obj)
retVal = yaffsfs_DoStat(obj,buf);
else
- // todo error not found
+ /* todo error not found */
yaffsfs_SetError(-ENOENT);
yaffsfs_Unlock();
int yaffs_fstat(int fd, struct yaffs_stat *buf)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
int retVal = -1;
if(obj)
retVal = yaffsfs_DoStat(obj,buf);
else
- // bad handle
+ /* 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;
+
+ int retVal = -1;
+
+ yaffsfs_Lock();
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
+
+ if(obj) {
+ retVal = yaffs_set_xattrib(obj,name,data,size,flags);
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
+ /* todo error not found */
+ yaffsfs_SetError(-ENOENT);
+
+ 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) {
+ retVal = yaffs_set_xattrib(obj,name,data,size,flags);
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
+ /* bad handle */
+ yaffsfs_SetError(-EBADF);
+
+ 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;
+
+ int retVal = -1;
+
+ yaffsfs_Lock();
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
+
+ if(obj) {
+ retVal = yaffs_get_xattrib(obj,name,data,size);
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
+ /* todo error not found */
+ yaffsfs_SetError(-ENOENT);
+
+ 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;
+
+ int retVal = -1;
+
+ yaffsfs_Lock();
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
+
+ if(obj) {
+ retVal = yaffs_list_xattrib(obj, data,size);
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
+ /* todo error not found */
+ yaffsfs_SetError(-ENOENT);
+
+ 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 yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
+{
+ struct yaffs_obj *obj;
+
+ int retVal = -1;
+
+ yaffsfs_Lock();
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
+
+ if(obj) {
+ retVal = yaffs_remove_xattrib(obj,name);
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
+ /* todo error not found */
+ yaffsfs_SetError(-ENOENT);
+
+ yaffsfs_Unlock();
+
+ return retVal;
+
+}
+
+int yaffs_removexattr(const YCHAR *path, const char *name)
+{
+ return yaffs_do_removexattr(path, name, 1);
+}
+
+int yaffs_lremovexattr(const YCHAR *path, const char *name)
+{
+ return yaffs_do_removexattr(path, name, 0);
+}
+
+int yaffs_fremovexattr(int fd, const char *name)
+{
+ struct yaffs_obj *obj;
+
+ int retVal = -1;
+
+ yaffsfs_Lock();
+ obj = yaffsfs_GetHandleObject(fd);
+
+ 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;
retVal = 0;
} else
- // bad handle
+ /* bad handle */
yaffsfs_SetError(-EBADF);
yaffsfs_Unlock();
const unsigned *watime,
const unsigned *wmtime)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
int result;
int retVal = -1;
}
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();
#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;
int yaffs_access(const YCHAR *path, int amode)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
int retval = 0;
+ if(amode & ~(R_OK | W_OK | X_OK)){
+ yaffsfs_SetError(-EINVAL);
+ return -1;
+ }
+
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(obj) {
int access_ok = 1;
retval = -1;
}
} else {
- // todo error not found
+ /* todo error not found */
yaffsfs_SetError(-ENOENT);
retval = -1;
}
int yaffs_chmod(const YCHAR *path, mode_t mode)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else
retVal = yaffsfs_DoChMod(obj,mode);
int yaffs_fchmod(int fd, mode_t mode)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
int retVal = -1;
if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else
retVal = yaffsfs_DoChMod(obj,mode);
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 *use_path = NULL;
+ int path_length = 0;
int retVal= -1;
+ int i;
+
+ /*
+ * We don't have a definition for max path length.
+ * We will use 3 * max name length instead.
+ */
+
+ 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])){
+ use_path = YMALLOC(path_length + 1);
+ if(!use_path){
+ yaffsfs_SetError(-ENOMEM);
+ return -1;
+ }
+ strcpy(use_path, path);
+ for(i = path_length-1;
+ i >= 0 && yaffsfs_IsPathDivider(use_path[i]);
+ i--)
+ use_path[i] = (YCHAR) 0;
+ path = use_path;
+ }
+
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,path,&name,0);
- if(parent && parent->myDev->readOnly){
+ if(parent && yaffs_strnlen(name,5) == 0){
+ /* Trying to make the root itself */
+ yaffsfs_SetError(-EEXIST);
+ } else if(parent && parent->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
} else {
if(parent)
- dir = yaffs_MknodDirectory(parent,name,mode,0,0);
+ dir = yaffs_create_dir(parent,name,mode,0,0);
if(dir)
retVal = 0;
else {
if(!parent)
- yaffsfs_SetError(-ENOENT); // missing path
- else if (yaffs_FindObjectByName(parent,name))
- yaffsfs_SetError(-EEXIST); // the name already exists
+ yaffsfs_SetError(-ENOENT); /* missing path */
+ else if (yaffs_find_by_name(parent,name))
+ yaffsfs_SetError(-EEXIST); /* the name already exists */
else
- yaffsfs_SetError(-ENOSPC); // just assume no space
+ yaffsfs_SetError(-ENOSPC); /* just assume no space */
retVal = -1;
}
}
yaffsfs_Unlock();
+ if(use_path)
+ YFREE(use_path);
+
return retVal;
}
-int yaffs_mount2(const YCHAR *path,int readOnly)
+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_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+ T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
yaffsfs_Lock();
- dev = yaffsfs_FindDevice(path,&dummy);
+
+ yaffsfs_InitHandles();
+
+ dev = yaffsfs_FindMountPoint(path);
if(dev){
- if(!dev->isMounted){
- dev->readOnly = readOnly ? 1 : 0;
- 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
+ /* todo error - mount failed */
yaffsfs_SetError(-ENOMEM);
retVal = result ? 0 : -1;
}
else
- //todo error - already mounted.
+ /* todo error - already mounted. */
yaffsfs_SetError(-EBUSY);
} else
- // todo error - no device
+ /* todo error - no device */
yaffsfs_SetError(-ENODEV);
yaffsfs_Unlock();
int yaffs_sync(const YCHAR *path)
{
int retVal=-1;
- yaffs_Device *dev=NULL;
+ struct yaffs_dev *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
- if(dev->isMounted){
-
- yaffs_FlushEntireDeviceCache(dev);
- yaffs_CheckpointSave(dev);
+ if(dev->is_mounted){
+ yaffs_flush_whole_cache(dev);
+ yaffs_checkpoint_save(dev);
+ retVal = 0;
} else
- //todo error - not mounted.
+ /* todo error - not mounted. */
yaffsfs_SetError(-EINVAL);
}else
- // todo error - no device
+ /* todo error - no device */
yaffsfs_SetError(-ENODEV);
yaffsfs_Unlock();
}
-int yaffs_remount(const YCHAR *path, int force, int readOnly)
+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;
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_flush_whole_cache(dev);
for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){
- if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
- inUse = 1; // the device is in use, can't unmount
+ 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 || force){
- if(readOnly)
- yaffs_CheckpointSave(dev);
- dev->readOnly = readOnly ? 1 : 0;
+ if(read_only)
+ yaffs_checkpoint_save(dev);
+ dev->read_only = read_only ? 1 : 0;
retVal = 0;
} else
yaffsfs_SetError(-EBUSY);
int yaffs_unmount2(const YCHAR *path, int force)
{
int retVal=-1;
- yaffs_Device *dev=NULL;
- YCHAR *dummy;
+ struct yaffs_dev *dev=NULL;
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);
+ 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->myDev == dev)
- inUse = 1; // the device is in use, can't unmount
+ 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){
- yaffs_Deinitialise(dev);
+ if(inUse)
+ yaffsfs_PutDeviceHandles(dev);
+ yaffs_deinitialise(dev);
retVal = 0;
} else
- // todo error can't unmount as files are open
+ /* todo error can't unmount as files are open */
yaffsfs_SetError(-EBUSY);
} else
- //todo error - not mounted.
+ /* todo error - not mounted. */
yaffsfs_SetError(-EINVAL);
- }
- else
- // todo error - no device
+ } else
+ /* todo error - no device */
yaffsfs_SetError(-ENODEV);
yaffsfs_Unlock();
loff_t yaffs_freespace(const YCHAR *path)
{
loff_t retVal=-1;
- yaffs_Device *dev=NULL;
+ struct yaffs_dev *dev=NULL;
YCHAR *dummy;
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);
loff_t yaffs_totalspace(const YCHAR *path)
{
loff_t retVal=-1;
- yaffs_Device *dev=NULL;
+ struct yaffs_dev *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
- if(dev && dev->isMounted){
- retVal = (dev->param.endBlock - dev->param.startBlock + 1) - dev->param.nReservedBlocks;
- retVal *= dev->param.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);
int yaffs_inodecount(const YCHAR *path)
{
loff_t retVal= -1;
- yaffs_Device *dev=NULL;
+ struct yaffs_dev *dev=NULL;
YCHAR *dummy;
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)
}
-
-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->param.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! */
}
{
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 */
* 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);
}
yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
{
yaffs_DIR *dir = NULL;
- yaffs_Object *obj = NULL;
+ struct yaffs_obj *obj = NULL;
yaffsfs_DirectorySearchContext *dsc = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,dirname,0);
+ obj = yaffsfs_FindObject(NULL,dirname,0,1);
- if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+ if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
dir = (yaffs_DIR *)dsc;
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);
}
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);
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 */
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
- if(parent && parent->myDev->readOnly)
+ if(parent && parent->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else if(parent){
- obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
+ obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath);
if(obj)
retVal = 0;
else{
- yaffsfs_SetError(-ENOSPC); // just assume no space for now
+ yaffsfs_SetError(-ENOSPC); /* just assume no space for now */
retVal = -1;
}
} else {
int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
{
- yaffs_Object *obj = NULL;
+ struct yaffs_obj *obj = NULL;
int retVal;
-
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!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;
+ YCHAR *alias = obj->variant.symlink_variant.alias;
memset(buf,0,bufsiz);
yaffs_strncpy(buf,alias,bufsiz - 1);
retVal = 0;
int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
{
- // Creates a link called newpath to existing oldpath
- yaffs_Object *obj = NULL;
- yaffs_Object *target = NULL;
+ /* Creates a link called newpath to existing oldpath */
+ struct yaffs_obj *obj = NULL;
+ struct yaffs_obj *target = NULL;
int retVal = 0;
- int newNameLength = 0;
-
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);
retVal = -1;
- } else if(obj->myDev->readOnly){
+ } else if(obj->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
retVal= -1;
} else if(target) {
yaffsfs_SetError(-EEXIST);
retVal = -1;
} else {
- yaffs_Object *newdir = NULL;
- yaffs_Object *link = NULL;
+ struct yaffs_obj *newdir = NULL;
+ struct yaffs_obj *link = NULL;
YCHAR *newname;
if(!newdir){
yaffsfs_SetError(-ENOTDIR);
retVal = -1;
- }else if(newdir->myDev != obj->myDev){
+ }else if(newdir->my_dev != obj->my_dev){
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;
- }
+ retVal = yaffsfs_CheckNameLength(newname);
if(retVal == 0) {
- link = yaffs_Link(newdir,newname,obj);
+ link = yaffs_link_obj(newdir,newname,obj);
if(link)
retVal = 0;
else{
int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
{
+ pathname=pathname;
+ mode=mode;
+ dev=dev;
return -1;
}
-int yaffs_DumpDevStruct(const YCHAR *path)
+
+
+/*
+ * yaffs_n_handles()
+ * Returns number of handles attached to the object
+ */
+int yaffs_n_handles(const YCHAR *path)
{
-#if 0
+ struct yaffs_obj *obj;
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ return yaffsfs_CountHandles(obj);
+}
+
+int yaffs_get_error(void)
+{
+ return yaffsfs_GetLastError();
+}
+
+int yaffs_set_error(int error)
+{
+ /*yaffsfs_SetError does not return. So the program is assumed to have worked. */
+ 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
);
projects / yaffs2.git / blobdiff