#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);
return 0;
}
+
+
+YLIST_HEAD(yaffsfs_deviceList);
+
/*
* yaffsfs_FindDevice
* yaffsfs_FindRoot
*/
static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
{
- yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
+ struct ylist_head *cfg;
const YCHAR *leftOver;
const YCHAR *p;
yaffs_Device *retval = NULL;
+ yaffs_Device *dev = NULL;
int thisMatchLength;
int longestMatch = -1;
int matching;
* 1) Actually matches a prefix (ie /a amd /abc will not match
* 2) Matches the longest.
*/
- while(cfg && cfg->prefix && cfg->dev){
+ ylist_for_each(cfg, &yaffsfs_deviceList){
+ dev = ylist_entry(cfg, yaffs_Device, devList);
leftOver = path;
- p = cfg->prefix;
+ p = dev->param.name;
thisMatchLength = 0;
matching = 1;
/* Skip over any /s in leftOver */
while(yaffsfs_IsPathDivider(*leftOver))
leftOver++;
-
- if( matching && (thisMatchLength > longestMatch)){
- /* Matched prefix */
+ // 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(obj)
obj = yaffs_GetEquivalentObject(obj);
- if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+ if(obj &&
+ obj->variantType != YAFFS_OBJECT_TYPE_FILE &&
+ obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
obj = NULL;
if(obj){
- /* The file already exists */
+ /* 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->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+ openDenied = 1;
+ yaffsfs_SetError(-EISDIR);
+ errorReported = 1;
+ }
/* Open should fail if O_CREAT and O_EXCL are specified since
* the file exists
yaffsfs_SetError(-EINVAL);
totalWritten=-1;
} else if( h && obj){
- if(isPwrite)
- startPos = offset;
if(h->append)
startPos = yaffs_GetObjectFileLength(obj);
+ else if(isPwrite)
+ startPos = offset;
else
startPos = h->position;
obj = yaffs_GetEquivalentObject(obj);
if(obj && buf){
- buf->st_dev = (int)obj->myDev->context;
+ buf->st_dev = (int)obj->myDev->osContext;
buf->st_ino = obj->objectId;
buf->st_mode = obj->yst_mode & ~S_IFMT; /* clear out file type bits */
return retVal;
}
-
+#ifndef CONFIG_YAFFS_WINCE
/* xattrib functions */
-int yaffs_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags)
+static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_FindObject(NULL,path,0);
- obj = yaffsfs_FollowLink(obj,0);
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
- if(obj)
+ if(obj) {
retVal = yaffs_SetXAttribute(obj,name,data,size,flags);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* todo error not found */
yaffsfs_SetError(-ENOENT);
}
+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)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
- if(obj)
+ if(obj) {
retVal = yaffs_SetXAttribute(obj,name,data,size,flags);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* bad handle */
yaffsfs_SetError(-EBADF);
return retVal;
}
-int yaffs_getxattr(const YCHAR *path, const char *name, void *data, int size)
+static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_FindObject(NULL,path,0);
- obj = yaffsfs_FollowLink(obj,0);
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
- if(obj)
+ if(obj) {
retVal = yaffs_GetXAttribute(obj,name,data,size);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* todo error not found */
yaffsfs_SetError(-ENOENT);
}
+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)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
- if(obj)
+ if(obj) {
retVal = yaffs_GetXAttribute(obj,name,data,size);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* bad handle */
yaffsfs_SetError(-EBADF);
return retVal;
}
-int yaffs_listxattr(const YCHAR *path, char *data, int size)
+static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_FindObject(NULL,path,0);
- obj = yaffsfs_FollowLink(obj,0);
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
- if(obj)
+ if(obj) {
retVal = yaffs_ListXAttributes(obj, data,size);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* todo error not found */
yaffsfs_SetError(-ENOENT);
}
+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)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
- if(obj)
+ if(obj) {
retVal = yaffs_ListXAttributes(obj,data,size);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* bad handle */
yaffsfs_SetError(-EBADF);
return retVal;
}
-int yaffs_removexattr(const YCHAR *path, const char *name)
+static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_FindObject(NULL,path,0);
- obj = yaffsfs_FollowLink(obj,0);
+ if(follow)
+ obj = yaffsfs_FollowLink(obj,0);
- if(obj)
+ if(obj) {
retVal = yaffs_RemoveXAttribute(obj,name);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ } else
/* todo error not found */
yaffsfs_SetError(-ENOENT);
}
+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)
{
yaffs_Object *obj;
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
- if(obj)
+ if(obj){
retVal = yaffs_RemoveXAttribute(obj,name);
- else
+ if(retVal< 0){
+ yaffsfs_SetError(retVal);
+ retVal = -1;
+ }
+ }else
/* bad handle */
yaffsfs_SetError(-EBADF);
return retVal;
}
+#endif
#ifdef CONFIG_YAFFS_WINCE
int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime)
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev && dev->isMounted) {
- int nObjects = dev->nObjectsCreated - dev->nFreeObjects;
+ int nObjects = dev->nObjects;
if(nObjects > dev->nHardLinks)
retVal = nObjects - dev->nHardLinks;
}
}
-
-void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList)
+void yaffs_AddDevice(yaffs_Device *dev)
{
+ dev->isMounted = 0;
+ dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
- yaffsfs_DeviceConfiguration *cfg;
-
- yaffsfs_configurationList = cfgList;
-
- yaffsfs_InitHandles();
+ if(!dev->devList.next)
+ YINIT_LIST_HEAD(&dev->devList);
- cfg = yaffsfs_configurationList;
+ ylist_add(&dev->devList,&yaffsfs_deviceList);
+}
- while(cfg && cfg->prefix && cfg->dev){
- cfg->dev->isMounted = 0;
- cfg->dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
- cfg++;
- }
+void yaffs_RemoveDevice(yaffs_Device *dev)
+{
+ ylist_del_init(&dev->devList);
+}
-}
/* Directory search stuff. */
projects / yaffs2.git / blobdiff