const YCHAR *path,
int symDepth, int getEquiv,
struct yaffs_obj **dirOut,
- int *notDir);
+ int *notDir, int *loop);
static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
return NULL;
}
-static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth)
+static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,
+ int symDepth, int *loop)
{
if(obj)
if(yaffsfs_IsPathDivider(*alias))
/* Starts with a /, need to scan from root up */
- obj = yaffsfs_FindObject(NULL,alias,symDepth++,1,NULL,NULL);
+ 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++,1,NULL,NULL);
+ obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,
+ 1,NULL,NULL,loop);
}
return obj;
}
*/
static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
const YCHAR *path, YCHAR **name, int symDepth,
- int *notDir)
+ int *notDir,int *loop)
{
struct yaffs_obj *dir;
YCHAR *restOfPath;
YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
int i;
- if(notDir)
- *notDir = 0;
-
- if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
+ if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES){
+ if(loop)
+ *loop = 1;
return NULL;
+ }
if(startDir){
dir = startDir;
else{
dir = yaffs_find_by_name(dir,str);
- dir = yaffsfs_FollowLink(dir,symDepth);
+ dir = yaffsfs_FollowLink(dir,symDepth,loop);
if(dir && dir->variant_type !=
YAFFS_OBJECT_TYPE_DIRECTORY){
return NULL;
}
-static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relDirectory,
+static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relDir,
const YCHAR *path,
YCHAR **name,
int symDepth,
- int *notDir)
+ int *notDir,
+ int *loop)
{
- return yaffsfs_DoFindDirectory(relDirectory,path,name,symDepth,notDir);
+ return yaffsfs_DoFindDirectory(relDir,path,name,symDepth,notDir,loop);
}
/*
* yaffsfs_FindObject turns a path for an existing object into the object
*/
-static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relDir,
const YCHAR *path,int symDepth, int getEquiv,
- struct yaffs_obj **dirOut, int *notDir)
+ struct yaffs_obj **dirOut, int *notDir,int *loop)
{
struct yaffs_obj *dir;
struct yaffs_obj *obj;
YCHAR *name;
- dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth,notDir);
+ dir = yaffsfs_FindDirectory(relDir,path,&name,symDepth,notDir,loop);
if(dirOut)
*dirOut = dir;
u8 alreadyWriting;
u8 readRequested;
u8 writeRequested;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yh = yaffsfs_GetHandlePointer(handle);
/* try to find the exisiting object */
- obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL);
- obj = yaffsfs_FollowLink(obj,symDepth++);
+ obj = yaffsfs_FollowLink(obj,symDepth++,&loop);
if(obj &&
obj->variant_type != YAFFS_OBJECT_TYPE_FILE &&
* the directory exists. If not, error.
*/
if(!obj && !errorReported){
- dir = yaffsfs_FindDirectory(NULL,path,&name,0,NULL);
- if(!dir){
+ 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;
}
}
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
int result = YAFFS_FAIL;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
+ 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->variant_type != YAFFS_OBJECT_TYPE_FILE)
struct yaffs_obj *obj = NULL;
YCHAR *name;
int result = YAFFS_FAIL;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL);
- dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬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)
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 rename_allowed = 1;
- int notOldDir;
- int notNewDir;
+ int notOldDir = 0;
+ int notNewDir = 0;
+ int oldLoop = 0;
+ int newLoop = 0;
+
YCHAR *alt_newpath=NULL;
if(yaffsfs_CheckPath(newPath) < 0){
yaffsfs_Lock();
- olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0,¬OldDir);
- newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,¬NewDir);
- obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL);
+ 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);
/* If the object being renamed is a directory and the
* path ended with a "/" then the olddir == obj.
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(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);
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retVal = -1;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop);
if(!doLStat && obj)
- obj = yaffsfs_FollowLink(obj,0);
+ 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
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop);
if(follow)
- obj = yaffsfs_FollowLink(obj,0);
+ 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 {
struct yaffs_obj *obj;
struct yaffs_obj *dir;
int retVal = -1;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop);
if(follow)
- obj = yaffsfs_FollowLink(obj,0);
+ 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 {
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retVal = -1;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop);
if(follow)
- obj = yaffsfs_FollowLink(obj,0);
+ 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 {
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
int retVal = -1;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop);
if(follow)
- obj = yaffsfs_FollowLink(obj,0);
+ 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 {
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
int retval = -1;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
- obj = yaffsfs_FollowLink(obj,0);
+ 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 {
+ 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))
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retVal = -1;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir,&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)
YCHAR *name;
YCHAR *alt_path = NULL;
int retVal= -1;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
path = alt_path;
yaffsfs_Lock();
- parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir);
+ 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){
yaffs_DIR *dir = NULL;
struct yaffs_obj *obj = NULL;
yaffsfs_DirectorySearchContext *dsc = NULL;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
if(yaffsfs_CheckPath(dirname) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,¬Dir);
+ obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,¬Dir,&loop);
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)
YCHAR *name;
int retVal= -1;
int mode = 0; /* ignore for now */
- int notDir;
+ 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,¬Dir);
+ 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)
obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath);
if(obj)
retVal = 0;
- else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL,NULL))
+ else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL,NULL,NULL))
yaffsfs_SetError(-EEXIST);
else
yaffsfs_SetError(-ENOSPC);
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
int retVal= -1;
- int notDir;
+ int notDir = 0;
+ int loop = 0;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop);
if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
+ else if(loop)
+ yaffsfs_SetError(-ELOOP);
else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
struct yaffs_obj *obj_dir = NULL;
struct yaffs_obj *lnk_dir = NULL;
int retVal = -1;
- int notDirObj;
- int notDirLnk;
+ int notDirObj = 0;
+ int notDirLnk = 0;
+ int objLoop = 0;
+ int lnkLoop = 0;
YCHAR *newname;
if(yaffsfs_CheckPath(linkpath) < 0){
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir,¬DirObj);
- lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL);
- lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,¬DirLnk);
+ 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_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);
else if(obj->my_dev->read_only)
return -1;
}
- obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL);
if(obj)
return yaffsfs_CountHandles(obj);