X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=76a397cf6a06e803dc7d9673c009b76c3b4a5674;hp=b7d337f1fa92568754abdbbe0b1fd7fec6087c05;hb=dd93a8090e78af3a429a55349cb05a4bf6fb2c39;hpb=28f7a6b7e49d9c8d782a14160ca1ef06aa5d6ec6

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index b7d337f..76a397c 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);
 
 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);
 
 /*
@@ -469,10 +506,10 @@ 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);
 		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);
 	}
 	return obj;
 }
@@ -485,13 +522,17 @@ 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)
 {
 	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)
 		return NULL;
 
@@ -502,6 +543,7 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
 	else
 		dir = yaffsfs_FindRoot(path,&restOfPath);
 
+
 	while(dir){
 		/*
 		 * parse off /.
@@ -538,8 +580,13 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
 
 				dir = yaffsfs_FollowLink(dir,symDepth);
 
-				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,10 +594,13 @@ 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 *relDirectory,
+					const YCHAR *path,
+					YCHAR **name,
+					int symDepth,
+					int *notDir)
 {
-	return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth);
+	return yaffsfs_DoFindDirectory(relDirectory,path,name,symDepth,notDir);
 }
 
 /*
@@ -558,13 +608,13 @@ static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirecto
  */
 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)
 {
 	struct yaffs_obj *dir;
 	struct yaffs_obj *obj;
 	YCHAR *name;
 
-	dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
+	dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth,notDir);
 
 	if(dirOut)
 		*dirOut =  dir;
@@ -663,7 +713,7 @@ 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);
 
 		obj = yaffsfs_FollowLink(obj,symDepth++);
 
@@ -748,7 +798,7 @@ 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);
+			dir = yaffsfs_FindDirectory(NULL,path,&name,0,NULL);
 			if(!dir){
 				yaffsfs_SetError(-ENOTDIR);
 				errorReported = 1;
@@ -1110,6 +1160,7 @@ 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;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1118,11 +1169,11 @@ 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,&notDir);
 
-	if(!dir)
+	if(!dir && notDir)
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj)
+	else if(!dir || !obj)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
 		yaffsfs_SetError(-EISDIR);
@@ -1212,6 +1263,7 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 	struct yaffs_obj *obj = NULL;
 	YCHAR *name;
 	int result = YAFFS_FAIL;
+	int notDir;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1220,11 +1272,15 @@ 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);
+	dir = yaffsfs_FindDirectory(NULL,path,&name,0,&notDir);
 
-	if(!dir)
+	if(!dir && notDir)
 		yaffsfs_SetError(-ENOTDIR);
+	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 +1289,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 +1314,59 @@ 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;
-
-	yaffsfs_Lock();
+	int notOldDir;
+	int notNewDir;
+	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();
+
+
+	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);
+	newobj = yaffsfs_FindObject(NULL,newPath,0,0,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 || !newdir) {
+	if((!olddir && notOldDir) || (!newdir && notNewDir)) {
 		yaffsfs_SetError(-ENOTDIR);
 		rename_allowed = 0;
-	} else if(!obj) {
+	} 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 +1375,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 +1395,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 +1448,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;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1368,14 +1458,14 @@ 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,&notDir);
 
 	if(!doLStat && obj)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(!dir)
+	if(!dir && notDir)
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj)
+	else if(!dir || !obj)
 		yaffsfs_SetError(-ENOENT);
 	else
 		retVal = yaffsfs_DoStat(obj,buf);
@@ -1424,6 +1514,7 @@ 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 retVal = -1;
 
@@ -1434,14 +1525,14 @@ 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,&notDir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else {
 		retVal = yaffs_set_xattrib(obj,name,data,size,flags);
@@ -1497,8 +1588,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;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1507,14 +1598,14 @@ 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,&notDir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else {
 		retVal = yaffs_get_xattrib(obj,name,data,size);
@@ -1568,8 +1659,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;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1578,14 +1669,14 @@ 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,&notDir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else {
 		retVal = yaffs_list_xattrib(obj, data,size);
@@ -1639,7 +1730,7 @@ 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 retVal = -1;
 
 	if(yaffsfs_CheckPath(path) < 0){
@@ -1649,14 +1740,14 @@ 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,&notDir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else {
 		retVal = yaffs_remove_xattrib(obj,name);
@@ -1807,7 +1898,7 @@ int yaffs_access(const YCHAR *path, int amode)
 {
 	struct yaffs_obj *obj=NULL;
 	struct yaffs_obj *dir=NULL;
-
+	int notDir;
 	int retval = -1;
 
 	if(yaffsfs_CheckPath(path) < 0){
@@ -1822,11 +1913,12 @@ 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,&notDir);
+	obj = yaffsfs_FollowLink(obj,0);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else {
 		int access_ok = 1;
@@ -1856,6 +1948,7 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
 	struct yaffs_obj *obj=NULL;
 	struct yaffs_obj *dir=NULL;
 	int retVal = -1;
+	int notDir;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1869,11 +1962,11 @@ 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, &notDir);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
 		yaffsfs_SetError(-EROFS);
@@ -1912,41 +2005,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 +2012,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 	YCHAR *name;
 	YCHAR *alt_path = NULL;
 	int retVal= -1;
+	int notDir;
 
 	if(yaffsfs_CheckPath(path) < 0){
 		yaffsfs_SetError(-ENAMETOOLONG);
@@ -1968,13 +2027,15 @@ 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,&notDir);
+	if(!parent && notDir)
 		yaffsfs_SetError(-ENOTDIR);
-	else if(parent && yaffs_strnlen(name,5) == 0){
+	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);
@@ -2386,17 +2447,24 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 	yaffs_DIR *dir = NULL;
  	struct yaffs_obj *obj = NULL;
 	yaffsfs_DirectorySearchContext *dsc = NULL;
+	int notDir;
 
 	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,&notDir);
 
-	if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
+	if(!obj && notDir)
+		yaffsfs_SetError(-ENOTDIR);
+	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 +2558,17 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 	YCHAR *name;
 	int retVal= -1;
 	int mode = 0; /* ignore for now */
+	int notDir;
 
 	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,&notDir);
+	if(!parent && notDir)
 		yaffsfs_SetError(-ENOTDIR);
-	else if( strlen(name) < 1)
+	else if( !parent || yaffs_strnlen(name,5) < 1)
 		yaffsfs_SetError(-ENOENT);
 	else if(parent->my_dev->read_only)
 		yaffsfs_SetError(-EROFS);
@@ -2507,7 +2576,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))
 			yaffsfs_SetError(-EEXIST);
 		else
 			yaffsfs_SetError(-ENOSPC);
@@ -2524,14 +2593,15 @@ 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;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
+	obj = yaffsfs_FindObject(NULL,path,0,1, &dir,&notDir);
 
-	if(!dir) 
+	if(!dir && notDir) 
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj) 
+	else if(!dir || !obj) 
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
 		yaffsfs_SetError(-EINVAL);
@@ -2553,6 +2623,8 @@ 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;
 	YCHAR *newname;
 
 	if(yaffsfs_CheckPath(linkpath) < 0){
@@ -2562,13 +2634,13 @@ 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,&notDirObj);
+	lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL);
+	lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,&notDirLnk);
 
-	if(!obj_dir || !lnk_dir)
+	if((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk))
 		yaffsfs_SetError(-ENOTDIR);
-	else if(!obj)
+	else if(!obj_dir || !lnk_dir || !obj)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
 		yaffsfs_SetError(-EINVAL);
@@ -2622,7 +2694,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);
 
 	if(obj)
 		return yaffsfs_CountHandles(obj);