X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=b6b5e444fbe0aebf67d2a9b293c1dd3498ede740;hp=b7d337f1fa92568754abdbbe0b1fd7fec6087c05;hb=256ce201932cb4fb035c9996c7ae700b24818c17;hpb=28f7a6b7e49d9c8d782a14160ca1ef06aa5d6ec6 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index b7d337f..b6b5e44 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -34,7 +34,8 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path, int symDepth, int getEquiv, - struct yaffs_obj **dirOut); + struct yaffs_obj **dirOut, + int *notDir, int *loop); static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj); @@ -339,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); /* @@ -458,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) @@ -469,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); + 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); + obj = yaffsfs_FindObject(obj->parent,alias,symDepth++, + 1,NULL,NULL,loop); } return obj; } @@ -485,15 +525,19 @@ static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth) * eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx" */ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, - const YCHAR *path, YCHAR **name, int symDepth) + const YCHAR *path, YCHAR **name, int symDepth, + int *notDir,int *loop) { struct yaffs_obj *dir; YCHAR *restOfPath; YCHAR str[YAFFS_MAX_NAME_LENGTH+1]; int i; - if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES) + if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES){ + if(loop) + *loop = 1; return NULL; + } if(startDir){ dir = startDir; @@ -502,6 +546,7 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, else dir = yaffsfs_FindRoot(path,&restOfPath); + while(dir){ /* * parse off /. @@ -536,10 +581,15 @@ 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) + if(dir && dir->variant_type != + YAFFS_OBJECT_TYPE_DIRECTORY){ + if(notDir) + *notDir = 1; dir = NULL; + } + } } } @@ -547,24 +597,28 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, return NULL; } -static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirectory, - const YCHAR *path,YCHAR **name,int symDepth) +static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relDir, + const YCHAR *path, + YCHAR **name, + int symDepth, + int *notDir, + int *loop) { - return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth); + 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) + 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); + dir = yaffsfs_FindDirectory(relDir,path,&name,symDepth,notDir,loop); if(dirOut) *dirOut = dir; @@ -630,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); @@ -663,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); + 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 && @@ -748,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); - 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; } } @@ -819,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(); @@ -1110,6 +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 = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1118,12 +1186,17 @@ int yaffs_truncate(const YCHAR *path,off_t new_size) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1,&dir); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + 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) @@ -1152,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 @@ -1212,6 +1285,8 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) struct yaffs_obj *obj = NULL; YCHAR *name; int result = YAFFS_FAIL; + int notDir = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1220,11 +1295,17 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,0,NULL); - dir = yaffsfs_FindDirectory(NULL,path,&name,0); + obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL,NULL); + dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); - if(!dir) + 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) + yaffsfs_SetError(-EINVAL); else if(!obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) @@ -1233,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); @@ -1256,31 +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 = 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); - newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0); - obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL); + if(yaffsfs_alt_dir_path(newPath, &alt_newpath) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; + } + if(alt_newpath) + newPath = alt_newpath; + + yaffsfs_Lock(); + - if(!olddir || !newdir) { + 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(!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); @@ -1289,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; @@ -1308,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; } @@ -1358,8 +1479,9 @@ 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 = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1368,14 +1490,16 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1,&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) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else retVal = yaffsfs_DoStat(obj,buf); @@ -1424,6 +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 = 0; + int loop = 0; int retVal = -1; @@ -1434,14 +1560,16 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1,&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) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_set_xattrib(obj,name,data,size,flags); @@ -1497,8 +1625,9 @@ 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 = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1507,14 +1636,16 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1,&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) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_get_xattrib(obj,name,data,size); @@ -1568,8 +1699,9 @@ 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 = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1578,14 +1710,16 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1,&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) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_list_xattrib(obj, data,size); @@ -1639,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 = 0; + int loop = 0; int retVal = -1; if(yaffsfs_CheckPath(path) < 0){ @@ -1649,14 +1784,16 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1, &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) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else { retVal = yaffs_remove_xattrib(obj,name); @@ -1807,7 +1944,8 @@ int yaffs_access(const YCHAR *path, int amode) { struct yaffs_obj *obj=NULL; struct yaffs_obj *dir=NULL; - + int notDir = 0; + int loop = 0; int retval = -1; if(yaffsfs_CheckPath(path) < 0){ @@ -1822,13 +1960,18 @@ int yaffs_access(const YCHAR *path, int amode) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1, &dir); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + 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)) @@ -1856,6 +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 = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1869,11 +2014,14 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1, &dir); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!dir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) yaffsfs_SetError(-EROFS); @@ -1912,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; @@ -1954,6 +2067,8 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) YCHAR *name; YCHAR *alt_path = NULL; int retVal= -1; + int notDir = 0; + int loop = 0; if(yaffsfs_CheckPath(path) < 0){ yaffsfs_SetError(-ENAMETOOLONG); @@ -1968,13 +2083,17 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) path = alt_path; yaffsfs_Lock(); - parent = yaffsfs_FindDirectory(NULL,path,&name,0); - if(!parent) + parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + if(!parent && notDir) yaffsfs_SetError(-ENOTDIR); - else if(parent && yaffs_strnlen(name,5) == 0){ + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!parent) + yaffsfs_SetError(-ENOENT); + else if(yaffs_strnlen(name,5) == 0){ /* Trying to make the root itself */ yaffsfs_SetError(-EEXIST); - } else if(parent && parent->my_dev->read_only) + } else if(parent->my_dev->read_only) yaffsfs_SetError(-EROFS); else { dir = yaffs_create_dir(parent,name,mode,0,0); @@ -2081,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); @@ -2386,17 +2507,27 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) yaffs_DIR *dir = NULL; struct yaffs_obj *obj = NULL; yaffsfs_DirectorySearchContext *dsc = NULL; + int notDir = 0; + int loop = 0; if(yaffsfs_CheckPath(dirname) < 0){ yaffsfs_SetError(-ENAMETOOLONG); - return -1; + return NULL; } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL); + obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,¬Dir,&loop); - if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ + 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) + yaffsfs_SetError(-ENOTDIR); + else { dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext)); dir = (yaffs_DIR *)dsc; @@ -2490,16 +2621,20 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) YCHAR *name; int retVal= -1; int mode = 0; /* ignore for now */ + 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); - if(!parent) + parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,¬Dir,&loop); + if(!parent && notDir) yaffsfs_SetError(-ENOTDIR); - else if( strlen(name) < 1) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if( !parent || yaffs_strnlen(name,5) < 1) yaffsfs_SetError(-ENOENT); else if(parent->my_dev->read_only) yaffsfs_SetError(-EROFS); @@ -2507,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)) + else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL,NULL,NULL)) yaffsfs_SetError(-EEXIST); else yaffsfs_SetError(-ENOSPC); @@ -2524,14 +2659,18 @@ 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 = 0; + int loop = 0; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1, &dir); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); - if(!dir) + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) yaffsfs_SetError(-EINVAL); @@ -2553,6 +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 = 0; + int notDirLnk = 0; + int objLoop = 0; + int lnkLoop = 0; YCHAR *newname; if(yaffsfs_CheckPath(linkpath) < 0){ @@ -2562,13 +2705,15 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir); - lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL); - lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0); + 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 || !lnk_dir) + if((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk)) yaffsfs_SetError(-ENOTDIR); - else if(!obj) + 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); @@ -2622,7 +2767,7 @@ int yaffs_n_handles(const YCHAR *path) return -1; } - obj = yaffsfs_FindObject(NULL,path,0,1,NULL); + obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL); if(obj) return yaffsfs_CountHandles(obj);