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 retVal;
}
+
+static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path)
+{
+ YCHAR *alt_path = NULL;
+ int path_length;
+ int i;
+
+ /*
+ * We don't have a definition for max path length.
+ * We will use 3 * max name length instead.
+ */
+ *ret_path = NULL;
+ path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
+
+ /* If the last character is a path divider, then we need to
+ * trim it back so that the name look-up works properly.
+ * eg. /foo/new_dir/ -> /foo/newdir
+ * Curveball: Need to handle multiple path dividers:
+ * eg. /foof/sdfse///// -> /foo/sdfse
+ */
+ if(path_length > 0 &&
+ yaffsfs_IsPathDivider(path[path_length-1])){
+ alt_path = YMALLOC(path_length + 1);
+ if(!alt_path)
+ return -1;
+ strcpy(alt_path, path);
+ for(i = path_length-1;
+ i >= 0 && yaffsfs_IsPathDivider(alt_path[i]);
+ i--)
+ alt_path[i] = (YCHAR) 0;
+ }
+ *ret_path = alt_path;
+ return 0;
+}
+
+
LIST_HEAD(yaffsfs_deviceList);
/*
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 &&
if( writeRequested && !(obj->yst_mode & S_IWRITE))
openDenied = 1;
+ if( !errorReported && writeRequested &&
+ obj->my_dev->read_only){
+ openDenied = 1;
+ yaffsfs_SetError(-EROFS);
+ errorReported = 1;
+ }
+
if(openDenied && !errorReported ) {
/* Error if the file exists but permissions are refused. */
yaffsfs_SetError(-EACCES);
* 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;
}
}
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);
+ yaffsfs_SetError(-EROFS);
errorReported = 1;
} else
obj = yaffs_create_file(dir,name,mode,0,0);
int yaffs_Dofsync(int fd,int datasync)
{
yaffsfs_Handle *h = NULL;
- int retVal = 0;
+ int retVal = -1;
yaffsfs_Lock();
h = yaffsfs_GetHandlePointer(fd);
- if(h && h->useCount > 0)
- /* flush the file */
- yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
- else {
- /* bad handle */
+ if(!h || h->useCount < 1)
yaffsfs_SetError(-EBADF);
- retVal = -1;
+ else {
+ struct yaffs_obj * obj;
+ obj = yaffsfs_inode[h->inodeId].iObj;
+ if(obj->my_dev->read_only)
+ yaffsfs_SetError(-EROFS);
+ else {
+ yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
+ retVal = 0;
+ }
}
yaffsfs_Unlock();
/* bad handle */
yaffsfs_SetError(-EBADF);
totalWritten = -1;
- } else if( h && obj && (!h->writing || obj->my_dev->read_only)){
+ } else if(!h->writing){
yaffsfs_SetError(-EINVAL);
totalWritten=-1;
+ } else if(obj->my_dev->read_only){
+ yaffsfs_SetError(-EROFS);
+ totalWritten=-1;
} else {
if(h->append)
startPos = yaffs_get_obj_length(obj);
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->my_dev->read_only)
+ yaffsfs_SetError(-EROFS);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
else if(obj->my_dev->read_only)
/* bad handle */
yaffsfs_SetError(-EBADF);
else if(obj->my_dev->read_only)
- yaffsfs_SetError(-EACCES);
+ yaffsfs_SetError(-EROFS);
else if( new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE)
yaffsfs_SetError(-EINVAL);
else
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(!dir || !obj)
+ else if(loop)
+ yaffsfs_SetError(-ELOOP);
+ else if(!dir)
yaffsfs_SetError(-ENOENT);
- else if(obj->my_dev->read_only)
+ else if(yaffs_strncmp(name,_Y("."),2) == 0)
yaffsfs_SetError(-EINVAL);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else if(obj->my_dev->read_only)
+ yaffsfs_SetError(-EROFS);
else if(!isDirectory && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
yaffsfs_SetError(-EISDIR);
else if(isDirectory && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
yaffsfs_SetError(-ENOTDIR);
+ else if(isDirectory && obj == obj->my_dev->root_dir)
+ yaffsfs_SetError(-EBUSY); /* Can't rmdir a root */
else {
result = yaffs_unlinker(dir,name);
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;
- yaffsfs_Lock();
+ YCHAR *alt_newpath=NULL;
if(yaffsfs_CheckPath(newPath) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
- 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);
+ if(yaffsfs_alt_dir_path(newPath, &alt_newpath) < 0){
+ yaffsfs_SetError(-ENOMEM);
+ return -1;
+ }
+ if(alt_newpath)
+ newPath = alt_newpath;
+
+ yaffsfs_Lock();
+
+
+ olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0,¬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.
+ * We pass through NULL for the old name to tell the lower layers
+ * to use olddir as the object.
+ */
+
+ if(olddir == obj)
+ oldname = NULL;
if((!olddir && notOldDir) || (!newdir && notNewDir)) {
yaffsfs_SetError(-ENOTDIR);
rename_allowed = 0;
- } else if(!olddir || !newdir || !obj) {
+ } else if(oldLoop || newLoop) {
+ yaffsfs_SetError(-ELOOP);
+ rename_allowed = 0;
+ } else if (olddir && oldname && yaffs_strncmp(oldname, _Y("."),2) == 0){
+ yaffsfs_SetError(-EINVAL);
+ rename_allowed = 0;
+ }else if(!olddir || !newdir || !obj) {
yaffsfs_SetError(-ENOENT);
rename_allowed = 0;
} else if(obj->my_dev->read_only){
yaffsfs_SetError(-EROFS);
rename_allowed = 0;
+ } else if(yaffs_is_non_empty_dir(newobj)){
+ yaffsfs_SetError(-ENOTEMPTY);
+ rename_allowed = 0;
} else if(olddir->my_dev != newdir->my_dev) {
/* Rename must be on same device */
yaffsfs_SetError(-EXDEV);
/*
* 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
+ * Do this by tracing from the new directory back to the root,
+ * checking for obj
*/
struct yaffs_obj *xx = newdir;
yaffsfs_Unlock();
+ if(alt_newpath)
+ YFREE(alt_newpath);
+
return (result == YAFFS_FAIL) ? -1 : 0;
}
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);
+ obj = yaffsfs_FollowLink(obj,0,&loop);
if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
+ else if(loop)
+ yaffsfs_SetError(-ELOOP);
else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
return retVal;
}
-
-static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path)
-{
- YCHAR *alt_path = NULL;
- int path_length;
- int i;
-
- /*
- * We don't have a definition for max path length.
- * We will use 3 * max name length instead.
- */
- *ret_path = NULL;
- path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
-
- /* If the last character is a path divider, then we need to
- * trim it back so that the name look-up works properly.
- * eg. /foo/new_dir/ -> /foo/newdir
- * Curveball: Need to handle multiple path dividers:
- * eg. /foof/sdfse///// -> /foo/sdfse
- */
- if(path_length > 0 &&
- yaffsfs_IsPathDivider(path[path_length-1])){
- alt_path = YMALLOC(path_length + 1);
- if(!alt_path)
- return -1;
- strcpy(alt_path, path);
- for(i = path_length-1;
- i >= 0 && yaffsfs_IsPathDivider(alt_path[i]);
- i--)
- alt_path[i] = (YCHAR) 0;
- }
- *ret_path = alt_path;
- return 0;
-}
-
int yaffs_mkdir(const YCHAR *path, mode_t mode)
{
struct yaffs_obj *parent = NULL;
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){
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
- if(dev->is_mounted){
+ if(!dev->is_mounted)
+ yaffsfs_SetError(-EINVAL);
+ else if(dev->read_only)
+ yaffsfs_SetError(-EROFS);
+ else {
yaffs_flush_whole_cache(dev);
yaffs_checkpoint_save(dev);
retVal = 0;
- } else
- yaffsfs_SetError(-EINVAL);
-
+ }
}else
yaffsfs_SetError(-ENODEV);
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)
- yaffsfs_SetError(-EINVAL);
+ yaffsfs_SetError(-EROFS);
else if(lnk)
yaffsfs_SetError(-EEXIST);
else if(lnk_dir->my_dev != obj->my_dev)
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);