X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=15d5aeb7b0ed35911f3edb8ea12fc090636981a6;hp=41d37f46601f1939e90ea883ec2002b1e348b3d6;hb=a1fc1d080819956c65887911f8ca64b2fdae16e8;hpb=ddc0558522ec4a25d3f12f1d0d83c81a6bb7996a

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 41d37f4..15d5aeb 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -31,7 +31,11 @@
 #define YAFFSFS_RW_SIZE  (1<<YAFFSFS_RW_SHIFT)
 
 /* Some forward references */
-static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path, int symDepth, int getEquiv);
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
+			const YCHAR *path,
+			int symDepth, int getEquiv,
+			struct yaffs_obj **dirOut);
+
 static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
 
 unsigned int yaffs_wr_attempts;
@@ -273,6 +277,18 @@ static int yaffsfs_PutHandle(int handle)
 	return 0;
 }
 
+static void yaffsfs_PutDeviceHandles(struct yaffs_dev *dev)
+{
+	yaffsfs_Handle *yh;
+	int i;
+	for(i = 0; i < YAFFSFS_N_HANDLES; i++){
+		yh = & yaffsfs_handle[i];
+		if(yh->useCount>0 && 
+			yaffsfs_inode[yh->inodeId].iObj->my_dev == dev)
+			yaffsfs_PutHandle(i);
+	}
+}
+
 
 
 
@@ -322,7 +338,7 @@ LIST_HEAD(yaffsfs_deviceList);
 /*
  * yaffsfs_FindDevice
  * yaffsfs_FindRoot
- * Scan the configuration list to find the root.
+ * Scan the configuration list to find the device
  * Curveballs: Should match paths that end in '/' too
  * Curveball2 Might have "/x/ and "/x/y". Need to return the longest match
  */
@@ -397,6 +413,16 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPat
 	return retval;
 }
 
+/* FindMountPoint only returns a dev entry if the path is a mount point */
+static struct yaffs_dev *yaffsfs_FindMountPoint(const YCHAR *path)
+{
+	struct yaffs_dev *dev;
+	YCHAR *restOfPath=NULL;
+	dev = yaffsfs_FindDevice(path,&restOfPath);
+	if(dev && restOfPath && *restOfPath)
+		dev = NULL;
+	return dev;
+}
 
 static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
@@ -421,10 +447,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);
+			obj = yaffsfs_FindObject(NULL,alias,symDepth++,1,NULL);
 		else
 			/* Relative to here, so use the parent of the symlink as a start */
-			obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1);
+			obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1,NULL);
 	}
 	return obj;
 }
@@ -508,7 +534,9 @@ static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirecto
 /*
  * yaffsfs_FindObject turns a path for an existing object into the object
  */
-static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path,int symDepth, int getEquiv)
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
+			const YCHAR *path,int symDepth, int getEquiv,
+			struct yaffs_obj **dirOut)
 {
 	struct yaffs_obj *dir;
 	struct yaffs_obj *obj;
@@ -516,6 +544,9 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
 
 	dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
 
+	if(dirOut)
+		*dirOut =  dir;
+
 	if(dir && *name)
 		obj = yaffs_find_by_name(dir,name);
 	else
@@ -605,7 +636,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);
+		obj = yaffsfs_FindObject(NULL,path,0,1,NULL);
 
 		obj = yaffsfs_FollowLink(obj,symDepth++);
 
@@ -870,7 +901,16 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off
 			nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
 			if(nToRead > nbyte)
 				nToRead = nbyte;
-			nRead = yaffs_file_rd(obj,buf,pos,nToRead);
+
+			/* Tricky bit... 
+			 * Need to reverify object in case the device was
+			 * unmounted in another thread.
+			 */
+			obj = yaffsfs_GetHandleObject(fd);
+			if(!obj)
+				nRead = 0;
+			else
+				nRead = yaffs_file_rd(obj,buf,pos,nToRead);
 
 			if(nRead > 0){
 				totalRead += nRead;
@@ -953,11 +993,21 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite,
 		yaffsfs_GetHandle(fd);
 		pos = startPos;
 		while(nbyte > 0) {
+
 			nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
 			if(nToWrite > nbyte)
 				nToWrite = nbyte;
 
-			nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,write_trhrough);
+			/* Tricky bit... 
+			 * Need to reverify object in case the device was
+			 * remounted or unmounted in another thread.
+			 */
+			obj = yaffsfs_GetHandleObject(fd);
+			if(!obj || obj->my_dev->read_only)
+				nWritten = 0;
+			else
+				nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,
+							write_trhrough);
 			if(nWritten > 0){
 				totalWritten += nWritten;
 				pos += nWritten;
@@ -1010,13 +1060,16 @@ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offse
 int yaffs_truncate(const YCHAR *path,off_t new_size)
 {
 	struct yaffs_obj *obj = NULL;
+	struct yaffs_obj *dir = NULL;
 	int result = YAFFS_FAIL;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
 
-	if(!obj)
+	if(!dir)
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
 		yaffsfs_SetError(-EISDIR);
@@ -1106,8 +1159,9 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,0);
+	obj = yaffsfs_FindObject(NULL,path,0,0,NULL);
 	dir = yaffsfs_FindDirectory(NULL,path,&name,0);
+
 	if(!dir)
 		yaffsfs_SetError(-ENOTDIR);
 	else if(!obj)
@@ -1157,14 +1211,16 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 
 	olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
 	newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
-	obj = yaffsfs_FindObject(NULL,oldPath,0,0);
+	obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL);
 
-	if(!olddir || !newdir || !obj) {
-		/* bad file */
-		yaffsfs_SetError(-EBADF);
+	if(!olddir || !newdir) {
+		yaffsfs_SetError(-ENOTDIR);
+		rename_allowed = 0;
+	} else if(!obj) {
+		yaffsfs_SetError(-ENOENT);
 		rename_allowed = 0;
 	} else if(obj->my_dev->read_only){
-		yaffsfs_SetError(-EINVAL);
+		yaffsfs_SetError(-EROFS);
 		rename_allowed = 0;
 	} else if(olddir->my_dev != newdir->my_dev) {
 		/* Rename must be on same device */
@@ -1185,7 +1241,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 			xx = xx->parent;
 		}
 		if(!rename_allowed)
-			yaffsfs_SetError(-EACCES);
+			yaffsfs_SetError(-EINVAL);
 	}
 
 	if(rename_allowed)
@@ -1241,22 +1297,24 @@ static int yaffsfs_DoStat(struct yaffs_obj *obj,struct yaffs_stat *buf)
 
 static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
 {
-	struct yaffs_obj *obj;
+	struct yaffs_obj *obj=NULL;
+	struct yaffs_obj *dir=NULL;
 
 	int retVal = -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
 
 	if(!doLStat && obj)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(obj)
-		retVal = yaffsfs_DoStat(obj,buf);
-	else
-		/* todo error not found */
+	if(!dir)
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj)
 		yaffsfs_SetError(-ENOENT);
+	else
+		retVal = yaffsfs_DoStat(obj,buf);
 
 	yaffsfs_Unlock();
 
@@ -1301,25 +1359,28 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf)
 static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow)
 {
 	struct yaffs_obj *obj;
+	struct yaffs_obj *dir;
 
 	int retVal = -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(obj) {
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
+		yaffsfs_SetError(-ENOENT);
+	else {
 		retVal = yaffs_set_xattrib(obj,name,data,size,flags);
 		if(retVal< 0){
 			yaffsfs_SetError(retVal);
 			retVal = -1;
 		}
-	} else
-		/* todo error not found */
-		yaffsfs_SetError(-ENOENT);
+	}
 
 	yaffsfs_Unlock();
 
@@ -1348,15 +1409,15 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl
 	yaffsfs_Lock();
 	obj = yaffsfs_GetHandleObject(fd);
 
-	if(obj) {
+	if(!obj) 
+		yaffsfs_SetError(-EBADF);
+	else {
 		retVal = yaffs_set_xattrib(obj,name,data,size,flags);
 		if(retVal< 0){
 			yaffsfs_SetError(retVal);
 			retVal = -1;
 		}
-	} else
-		/* bad handle */
-		yaffsfs_SetError(-EBADF);
+	}
 
 	yaffsfs_Unlock();
 
@@ -1366,26 +1427,28 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl
 static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow)
 {
 	struct yaffs_obj *obj;
+	struct yaffs_obj *dir;
 
 	int retVal = -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(obj) {
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
+		yaffsfs_SetError(-ENOENT);
+	else {
 		retVal = yaffs_get_xattrib(obj,name,data,size);
 		if(retVal< 0){
 			yaffsfs_SetError(retVal);
 			retVal = -1;
 		}
-	} else
-		/* todo error not found */
-		yaffsfs_SetError(-ENOENT);
-
+	}
 	yaffsfs_Unlock();
 
 	return retVal;
@@ -1429,26 +1492,29 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
 
 static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow)
 {
-	struct yaffs_obj *obj;
+	struct yaffs_obj *obj=NULL;
+	struct yaffs_obj *dir=NULL;
 
 	int retVal = -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(obj) {
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
+		yaffsfs_SetError(-ENOENT);
+	else {
 		retVal = yaffs_list_xattrib(obj, data,size);
 		if(retVal< 0){
 			yaffsfs_SetError(retVal);
 			retVal = -1;
 		}
-	} else
-		/* todo error not found */
-		yaffsfs_SetError(-ENOENT);
+	}
 
 	yaffsfs_Unlock();
 
@@ -1492,26 +1558,29 @@ int yaffs_flistxattr(int fd, char *data, int size)
 
 static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
 {
-	struct yaffs_obj *obj;
+	struct yaffs_obj *obj=NULL;
+	struct yaffs_obj *dir=NULL;
 
 	int retVal = -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
 
 	if(follow)
 		obj = yaffsfs_FollowLink(obj,0);
 
-	if(obj) {
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
+		yaffsfs_SetError(-ENOENT);
+	else {
 		retVal = yaffs_remove_xattrib(obj,name);
 		if(retVal< 0){
 			yaffsfs_SetError(retVal);
 			retVal = -1;
 		}
-	} else
-		/* todo error not found */
-		yaffsfs_SetError(-ENOENT);
+	}
 
 	yaffsfs_Unlock();
 
@@ -1652,7 +1721,8 @@ static int yaffsfs_DoChMod(struct yaffs_obj *obj,mode_t mode)
 
 int yaffs_access(const YCHAR *path, int amode)
 {
-	struct yaffs_obj *obj;
+	struct yaffs_obj *obj=NULL;
+	struct yaffs_obj *dir=NULL;
 
 	int retval = 0;
 
@@ -1663,9 +1733,13 @@ int yaffs_access(const YCHAR *path, int amode)
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
 
-	if(obj)	{
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
+		yaffsfs_SetError(-ENOENT);
+	else {
 		int access_ok = 1;
 
 		if((amode & R_OK) && !(obj->yst_mode & S_IREAD))
@@ -1679,10 +1753,6 @@ int yaffs_access(const YCHAR *path, int amode)
 			yaffsfs_SetError(-EACCES);
 			retval = -1;
 		}
-	} else {
-		/* todo error not found */
-		yaffsfs_SetError(-ENOENT);
-		retval = -1;
 	}
 
 	yaffsfs_Unlock();
@@ -1694,18 +1764,25 @@ int yaffs_access(const YCHAR *path, int amode)
 
 int yaffs_chmod(const YCHAR *path, mode_t mode)
 {
-	struct yaffs_obj *obj;
-
+	struct yaffs_obj *obj=NULL;
+	struct yaffs_obj *dir=NULL;
 	int retVal = -1;
 
+	if(mode & ~(0777)){
+		yaffsfs_SetError(-EINVAL);
+		return -1;
+	}
+
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
 
-	if(!obj)
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
-		yaffsfs_SetError(-EINVAL);
+		yaffsfs_SetError(-EROFS);
 	else
 		retVal = yaffsfs_DoChMod(obj,mode);
 
@@ -1719,16 +1796,20 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
 int yaffs_fchmod(int fd, mode_t mode)
 {
 	struct yaffs_obj *obj;
-
 	int retVal = -1;
 
+	if(mode & ~(0777)){
+		yaffsfs_SetError(-EINVAL);
+		return -1;
+	}
+
 	yaffsfs_Lock();
 	obj = yaffsfs_GetHandleObject(fd);
 
 	if(!obj)
-		yaffsfs_SetError(-ENOENT);
+		yaffsfs_SetError(-EBADF);
 	else if(obj->my_dev->read_only)
-		yaffsfs_SetError(-EINVAL);
+		yaffsfs_SetError(-EROFS);
 	else
 		retVal = yaffsfs_DoChMod(obj,mode);
 
@@ -1821,7 +1902,6 @@ int yaffs_mount2(const YCHAR *path,int read_only)
 	int retVal=-1;
 	int result=YAFFS_FAIL;
 	struct yaffs_dev *dev=NULL;
-	YCHAR *dummy;
 
 	T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
@@ -1829,7 +1909,7 @@ int yaffs_mount2(const YCHAR *path,int read_only)
 
 	yaffsfs_InitHandles();
 
-	dev = yaffsfs_FindDevice(path,&dummy);
+	dev = yaffsfs_FindMountPoint(path);
 	if(dev){
 		if(!dev->is_mounted){
 			dev->read_only = read_only ? 1 : 0;
@@ -1889,10 +1969,10 @@ int yaffs_remount(const YCHAR *path, int force, int read_only)
 {
         int retVal=-1;
 	struct yaffs_dev *dev=NULL;
-	YCHAR *dummy;
+	yaffsfs_Handle *yh;
 
 	yaffsfs_Lock();
-	dev = yaffsfs_FindDevice(path,&dummy);
+	dev = yaffsfs_FindMountPoint(path);
 	if(dev){
 		if(dev->is_mounted){
 			int i;
@@ -1901,7 +1981,9 @@ int yaffs_remount(const YCHAR *path, int force, int read_only)
 			yaffs_flush_whole_cache(dev);
 
 			for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){
-				if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
+				yh = & yaffsfs_handle[i];
+				if(yh->useCount>0 && 
+					yaffsfs_inode[yh->inodeId].iObj->my_dev == dev)
 					inUse = 1; /* the device is in use, can't unmount */
 			}
 
@@ -1929,10 +2011,9 @@ int yaffs_unmount2(const YCHAR *path, int force)
 {
         int retVal=-1;
 	struct yaffs_dev *dev=NULL;
-	YCHAR *dummy;
 
 	yaffsfs_Lock();
-	dev = yaffsfs_FindDevice(path,&dummy);
+	dev = yaffsfs_FindMountPoint(path);
 	if(dev){
 		if(dev->is_mounted){
 			int i;
@@ -1942,11 +2023,14 @@ int yaffs_unmount2(const YCHAR *path, int force)
 			yaffs_checkpoint_save(dev);
 
 			for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){
-				if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
+				if(yaffsfs_handle[i].useCount > 0 && 
+				yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
 					inUse = 1; /* the device is in use, can't unmount */
 			}
 
 			if(!inUse || force){
+				if(inUse)
+					yaffsfs_PutDeviceHandles(dev);
 				yaffs_deinitialise(dev);
 
 				retVal = 0;
@@ -1958,8 +2042,7 @@ int yaffs_unmount2(const YCHAR *path, int force)
 			/* todo error - not mounted. */
 			yaffsfs_SetError(-EINVAL);
 
-	}
-	else
+	} else
 		/* todo error - no device */
 		yaffsfs_SetError(-ENODEV);
 
@@ -2150,7 +2233,7 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,dirname,0,1);
+	obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL);
 
 	if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
 
@@ -2273,19 +2356,20 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 {
 	struct yaffs_obj *obj = NULL;
-	int retVal;
+	struct yaffs_obj *dir = NULL;
+	int retVal= -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
 
-	if(!obj) {
+	if(!dir) 
+		yaffsfs_SetError(-ENOTDIR);
+	else if(!obj) 
 		yaffsfs_SetError(-ENOENT);
-		retVal = -1;
-	} else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) {
+	else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
 		yaffsfs_SetError(-EINVAL);
-		retVal = -1;
-	} else {
+	else {
 		YCHAR *alias = obj->variant.symlink_variant.alias;
 		memset(buf,0,bufsiz);
 		yaffs_strncpy(buf,alias,bufsiz - 1);
@@ -2295,42 +2379,36 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 	return retVal;
 }
 
-int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
+int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 {
 	/* Creates a link called newpath to existing oldpath */
 	struct yaffs_obj *obj = NULL;
-	struct yaffs_obj *target = NULL;
-	int retVal = 0;
+	struct yaffs_obj *lnk = NULL;
+	int retVal = -1;
 
 	yaffsfs_Lock();
 
-	obj = yaffsfs_FindObject(NULL,oldpath,0,1);
-	target = yaffsfs_FindObject(NULL,newpath,0,0);
+	obj = yaffsfs_FindObject(NULL,oldpath,0,1,NULL);
+	lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL);
 
-	if(!obj) {
+	if(!obj)
 		yaffsfs_SetError(-ENOENT);
-		retVal = -1;
-	} else if(obj->my_dev->read_only){
+	else if(obj->my_dev->read_only)
 		yaffsfs_SetError(-EINVAL);
-		retVal= -1;
-	} else if(target) {
+	else if(lnk)
 		yaffsfs_SetError(-EEXIST);
-		retVal = -1;
-	} else {
+	else {
 		struct yaffs_obj *newdir = NULL;
 		struct yaffs_obj *link = NULL;
 
 		YCHAR *newname;
 
-		newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0);
+		newdir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0);
 
-		if(!newdir){
+		if(!newdir)
 			yaffsfs_SetError(-ENOTDIR);
-			retVal = -1;
-		}else if(newdir->my_dev != obj->my_dev){
+		else if(newdir->my_dev != obj->my_dev)
 			yaffsfs_SetError(-EXDEV);
-			retVal = -1;
-		}
 		
 		retVal = yaffsfs_CheckNameLength(newname);
 		
@@ -2352,6 +2430,9 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 
 int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
 {
+	pathname=pathname;
+	mode=mode;
+	dev=dev;
 	return -1;
 }
 
@@ -2365,7 +2446,7 @@ int yaffs_n_handles(const YCHAR *path)
 {
 	struct yaffs_obj *obj;
 
-	obj = yaffsfs_FindObject(NULL,path,0,1);
+	obj = yaffsfs_FindObject(NULL,path,0,1,NULL);
 
 	return yaffsfs_CountHandles(obj);
 }
@@ -2384,7 +2465,9 @@ int yaffs_set_error(int error)
 
 int yaffs_dump_dev(const YCHAR *path)
 {
-#if 0
+#if 1
+	path=path;
+#else
 	YCHAR *rest;
 
 	struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);