/* Some forward references */
static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
- const YCHAR *path, int symDepth, int getEquiv);
+ const YCHAR *path,
+ int symDepth, int getEquiv,
+ struct yaffs_obj **dirOut);
+
static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
unsigned int yaffs_wr_attempts;
if(yaffsfs_IsPathDivider(*alias))
/* Starts with a /, need to scan from root up */
- obj = yaffsfs_FindObject(NULL,alias,symDepth++,1);
+ obj = yaffsfs_FindObject(NULL,alias,symDepth++,1,NULL);
else
/* Relative to here, so use the parent of the symlink as a start */
- obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1);
+ obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1,NULL);
}
return obj;
}
/*
* 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)
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
+ const YCHAR *path,int symDepth, int getEquiv,
+ struct yaffs_obj **dirOut)
{
struct yaffs_obj *dir;
struct yaffs_obj *obj;
dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
+ if(dirOut)
+ *dirOut = dir;
+
if(dir && *name)
obj = yaffs_find_by_name(dir,name);
else
yh = yaffsfs_GetHandlePointer(handle);
/* try to find the exisiting object */
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL);
obj = yaffsfs_FollowLink(obj,symDepth++);
int yaffs_truncate(const YCHAR *path,off_t new_size)
{
struct yaffs_obj *obj = NULL;
+ struct yaffs_obj *dir = NULL;
int result = YAFFS_FAIL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
- if(!obj)
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,0);
+ obj = yaffsfs_FindObject(NULL,path,0,0,NULL);
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
+
if(!dir)
yaffsfs_SetError(-ENOTDIR);
else if(!obj)
}
-int yaffs_rmdir(const YCHAR *path)
-{
- return yaffsfs_DoUnlink(path,1);
-}
-
int yaffs_unlink(const YCHAR *path)
{
return yaffsfs_DoUnlink(path,0);
olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
- obj = yaffsfs_FindObject(NULL,oldPath,0,0);
+ obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL);
- if(!olddir || !newdir || !obj) {
- /* bad file */
- yaffsfs_SetError(-EBADF);
+ if(!olddir || !newdir) {
+ yaffsfs_SetError(-ENOTDIR);
+ rename_allowed = 0;
+ } else if(!obj) {
+ yaffsfs_SetError(-ENOENT);
rename_allowed = 0;
} else if(obj->my_dev->read_only){
- yaffsfs_SetError(-EINVAL);
+ yaffsfs_SetError(-EROFS);
rename_allowed = 0;
} else if(olddir->my_dev != newdir->my_dev) {
/* Rename must be on same device */
xx = xx->parent;
}
if(!rename_allowed)
- yaffsfs_SetError(-EACCES);
+ yaffsfs_SetError(-EINVAL);
}
if(rename_allowed)
static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
{
- struct yaffs_obj *obj;
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
if(!doLStat && obj)
obj = yaffsfs_FollowLink(obj,0);
- if(obj)
- retVal = yaffsfs_DoStat(obj,buf);
- else
- /* todo error not found */
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
yaffsfs_SetError(-ENOENT);
+ else
+ retVal = yaffsfs_DoStat(obj,buf);
yaffsfs_Unlock();
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 retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else {
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();
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
- if(obj) {
+ if(!obj)
+ yaffsfs_SetError(-EBADF);
+ else {
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();
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;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else {
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;
static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow)
{
- struct yaffs_obj *obj;
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else {
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();
static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
{
- struct yaffs_obj *obj;
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else {
retVal = yaffs_remove_xattrib(obj,name);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
}
- } else
- /* todo error not found */
- yaffsfs_SetError(-ENOENT);
+ }
yaffsfs_Unlock();
int yaffs_access(const YCHAR *path, int amode)
{
- struct yaffs_obj *obj;
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
- int retval = 0;
+ int retval = -1;
if(amode & ~(R_OK | W_OK | X_OK)){
yaffsfs_SetError(-EINVAL);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
- if(obj) {
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else {
int access_ok = 1;
if((amode & R_OK) && !(obj->yst_mode & S_IREAD))
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();
int yaffs_chmod(const YCHAR *path, mode_t mode)
{
- struct yaffs_obj *obj;
-
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
int retVal = -1;
+ if(mode & ~(0777)){
+ yaffsfs_SetError(-EINVAL);
+ return -1;
+ }
+
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
- if(!obj)
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
- yaffsfs_SetError(-EINVAL);
+ yaffsfs_SetError(-EROFS);
else
retVal = yaffsfs_DoChMod(obj,mode);
int yaffs_fchmod(int fd, mode_t mode)
{
struct yaffs_obj *obj;
-
int retVal = -1;
+ if(mode & ~(0777)){
+ yaffsfs_SetError(-EINVAL);
+ return -1;
+ }
+
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
if(!obj)
- yaffsfs_SetError(-ENOENT);
+ yaffsfs_SetError(-EBADF);
else if(obj->my_dev->read_only)
- yaffsfs_SetError(-EINVAL);
+ yaffsfs_SetError(-EROFS);
else
retVal = yaffsfs_DoChMod(obj,mode);
}
-int yaffs_mkdir(const YCHAR *path, mode_t mode)
+static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path)
{
- struct yaffs_obj *parent = NULL;
- struct yaffs_obj *dir = NULL;
- YCHAR *name;
- YCHAR *use_path = NULL;
- int path_length = 0;
- int retVal= -1;
+ 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
*/
if(path_length > 0 &&
yaffsfs_IsPathDivider(path[path_length-1])){
- use_path = YMALLOC(path_length + 1);
- if(!use_path){
- yaffsfs_SetError(-ENOMEM);
+ alt_path = YMALLOC(path_length + 1);
+ if(!alt_path)
return -1;
- }
- strcpy(use_path, path);
+ strcpy(alt_path, path);
for(i = path_length-1;
- i >= 0 && yaffsfs_IsPathDivider(use_path[i]);
+ i >= 0 && yaffsfs_IsPathDivider(alt_path[i]);
i--)
- use_path[i] = (YCHAR) 0;
- path = use_path;
+ alt_path[i] = (YCHAR) 0;
}
+ *ret_path = alt_path;
+ return 0;
+}
+
+int yaffs_mkdir(const YCHAR *path, mode_t mode)
+{
+ struct yaffs_obj *parent = NULL;
+ struct yaffs_obj *dir = NULL;
+ YCHAR *name;
+ YCHAR *alt_path = NULL;
+ int retVal= -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 && yaffs_strnlen(name,5) == 0){
+ if(!parent)
+ yaffsfs_SetError(-ENOTDIR);
+ else 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_create_dir(parent,name,mode,0,0);
+ } else if(parent && parent->my_dev->read_only)
+ yaffsfs_SetError(-EROFS);
+ else {
+ dir = yaffs_create_dir(parent,name,mode,0,0);
if(dir)
retVal = 0;
- else {
- if(!parent)
- 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 */
- retVal = -1;
- }
+ else if (yaffs_find_by_name(parent,name))
+ yaffsfs_SetError(-EEXIST); /* the name already exists */
+ else
+ yaffsfs_SetError(-ENOSPC); /* just assume no space */
}
yaffsfs_Unlock();
- if(use_path)
- YFREE(use_path);
+ if(alt_path)
+ YFREE(alt_path);
return retVal;
}
+int yaffs_rmdir(const YCHAR *path)
+{
+ int result;
+ YCHAR *alt_path;
+
+ 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;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,dirname,0,1);
+ obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL);
if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
- if(parent && parent->my_dev->read_only)
- yaffsfs_SetError(-EINVAL);
+ if(!parent)
+ yaffsfs_SetError(-ENOTDIR);
+ else if( strlen(name) < 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)
yaffsfs_SetError(-ENOSPC); /* just assume no space for now */
retVal = -1;
}
- } else {
- yaffsfs_SetError(-EINVAL);
- retVal = -1;
}
yaffsfs_Unlock();
int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
{
struct yaffs_obj *obj = NULL;
- int retVal;
+ struct yaffs_obj *dir = NULL;
+ int retVal= -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
- if(!obj) {
+ if(!dir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
yaffsfs_SetError(-ENOENT);
- retVal = -1;
- } else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) {
+ else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
yaffsfs_SetError(-EINVAL);
- retVal = -1;
- } else {
+ else {
YCHAR *alias = obj->variant.symlink_variant.alias;
memset(buf,0,bufsiz);
yaffs_strncpy(buf,alias,bufsiz - 1);
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 */
struct yaffs_obj *obj = NULL;
- struct yaffs_obj *target = NULL;
- int retVal = 0;
+ struct yaffs_obj *lnk = NULL;
+ int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,oldpath,0,1);
- target = yaffsfs_FindObject(NULL,newpath,0,0);
+ obj = yaffsfs_FindObject(NULL,oldpath,0,1,NULL);
+ lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL);
- if(!obj) {
+ if(!obj)
yaffsfs_SetError(-ENOENT);
- retVal = -1;
- } else if(obj->my_dev->read_only){
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
- retVal= -1;
- } else if(target) {
+ else if(lnk)
yaffsfs_SetError(-EEXIST);
- retVal = -1;
- } else {
+ else {
struct yaffs_obj *newdir = NULL;
struct yaffs_obj *link = NULL;
YCHAR *newname;
- newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0);
+ newdir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0);
- if(!newdir){
+ if(!newdir)
yaffsfs_SetError(-ENOTDIR);
- retVal = -1;
- }else if(newdir->my_dev != obj->my_dev){
+ else if(newdir->my_dev != obj->my_dev)
yaffsfs_SetError(-EXDEV);
- retVal = -1;
- }
retVal = yaffsfs_CheckNameLength(newname);
{
struct yaffs_obj *obj;
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL);
return yaffsfs_CountHandles(obj);
}
projects / yaffs2.git / blobdiff