projects / yaffs2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
yaffs direct: Fix EROFS handling in some functions.
[yaffs2.git] / direct / yaffsfs.c
diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 0b151a2793b4d3fa2bf1d082c57dec4678767721..b6b5e444fbe0aebf67d2a9b293c1dd3498ede740 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -35,7 +35,7 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
                        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);
 
@@ -340,6 +340,42 @@ int yaffsfs_CheckNameLength(const char *name)
        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);
 
 /*
@@ -459,7 +495,8 @@ static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
        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)
@@ -470,10 +507,12 @@ static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth)
 
                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;
 }
@@ -487,18 +526,18 @@ static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth)
  */
 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;
@@ -542,7 +581,7 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *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){
@@ -558,27 +597,28 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
        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;
@@ -644,6 +684,8 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
        u8 alreadyWriting;
        u8 readRequested;
        u8 writeRequested;
+       int notDir = 0;
+       int loop = 0;
 
        if(yaffsfs_CheckPath(path) < 0){
                yaffsfs_SetError(-ENAMETOOLONG);
@@ -677,9 +719,9 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
                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 &&
@@ -762,10 +804,16 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
                 * 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,&notDir,&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;
                        }
                }
 
@@ -833,19 +881,23 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
 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();
@@ -1124,7 +1176,8 @@ int yaffs_truncate(const YCHAR *path,off_t new_size)
        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);
@@ -1133,12 +1186,17 @@ int yaffs_truncate(const YCHAR *path,off_t new_size)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir,&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)
@@ -1167,7 +1225,7 @@ int yaffs_ftruncate(int fd, off_t new_size)
                /* 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
@@ -1227,7 +1285,8 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
        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);
@@ -1236,12 +1295,18 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL);
-       dir = yaffsfs_FindDirectory(NULL,path,&name,0,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL,NULL);
+       dir = yaffsfs_FindDirectory(NULL,path,&name,0,&notDir,&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(yaffs_strncmp(name,_Y("."),2) == 0)
+               yaffsfs_SetError(-EINVAL);
+       else if(!obj)
                yaffsfs_SetError(-ENOENT);
        else if(obj->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
@@ -1249,6 +1314,8 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
                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);
 
@@ -1272,33 +1339,65 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
        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,&notOldDir);
-       newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,&notNewDir);
-       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,&notOldDir,&oldLoop);
+       newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,&notNewDir,&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);
@@ -1307,7 +1406,8 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
                /*
                 * 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;
@@ -1326,6 +1426,9 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 
        yaffsfs_Unlock();
 
+       if(alt_newpath)
+               YFREE(alt_newpath);
+
        return (result == YAFFS_FAIL) ? -1 : 0;
 }
 
@@ -1377,7 +1480,8 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d
        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);
@@ -1386,13 +1490,15 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir,&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
@@ -1442,7 +1548,8 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da
 {
        struct yaffs_obj *obj;
        struct yaffs_obj *dir;
-       int notDir;
+       int notDir = 0;
+       int loop = 0;
 
        int retVal = -1;
 
@@ -1453,13 +1560,15 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir,&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 {
@@ -1517,7 +1626,8 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in
        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);
@@ -1526,13 +1636,15 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir,&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 {
@@ -1588,7 +1700,8 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo
        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);
@@ -1597,13 +1710,15 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1,&dir,&notDir,&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 {
@@ -1658,7 +1773,8 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
 {
        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){
@@ -1668,13 +1784,15 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1, &dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1, &dir,&notDir,&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 {
@@ -1826,7 +1944,8 @@ int yaffs_access(const YCHAR *path, int amode)
 {
        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){
@@ -1841,13 +1960,18 @@ int yaffs_access(const YCHAR *path, int amode)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1, &dir,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1, &dir,&notDir,&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))
@@ -1875,7 +1999,8 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
        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);
@@ -1889,10 +2014,13 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0,1, &dir, &notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1, &dir, &notDir,&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)
@@ -1932,41 +2060,6 @@ int yaffs_fchmod(int fd, mode_t mode)
        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;
@@ -1974,7 +2067,8 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
        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);
@@ -1989,9 +2083,11 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
                path = alt_path;
        
        yaffsfs_Lock();
-       parent = yaffsfs_FindDirectory(NULL,path,&name,0,&notDir);
+       parent = yaffsfs_FindDirectory(NULL,path,&name,0,&notDir,&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){
@@ -2104,15 +2200,17 @@ int yaffs_sync(const YCHAR *path)
         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);
 
@@ -2409,7 +2507,8 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
        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);
@@ -2418,10 +2517,12 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,&notDir);
+       obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,&notDir,&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)
@@ -2520,16 +2621,19 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
        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,&notDir);
+       parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,&notDir,&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)
@@ -2538,7 +2642,7 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
                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);
@@ -2555,14 +2659,17 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
        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,&notDir);
+       obj = yaffsfs_FindObject(NULL,path,0,1, &dir,&notDir,&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)
@@ -2585,8 +2692,10 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
        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){
@@ -2596,12 +2705,14 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir,&notDirObj);
-       lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL);
-       lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,&notDirLnk);
+       obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir,&notDirObj,&objLoop);
+       lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL,NULL);
+       lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,&notDirLnk,&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)
@@ -2656,7 +2767,7 @@ int yaffs_n_handles(const YCHAR *path)
                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);
The YAFFS2 repository.