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

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 3cd532e..41d37f4 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -67,14 +67,14 @@ static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
 static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
 static int yaffsfs_handlesInitialised;
 
-unsigned int yaffs_trace_mask;
 
-int yaffs_set_trace(unsigned int tm) 
+unsigned yaffs_set_trace(unsigned  tm) 
 {
-	return yaffs_trace_mask=tm;
+	yaffs_trace_mask = tm;
+	return yaffs_trace_mask;
 }
 
-unsigned int yaffs_get_trace(void)
+unsigned yaffs_get_trace(void)
 {
 	return yaffs_trace_mask;
 }
@@ -277,7 +277,7 @@ static int yaffsfs_PutHandle(int handle)
 
 
 /*
- *  Stuff to search for a directory from a path
+ *  Stuff to handle names.
  */
 
 
@@ -300,7 +300,22 @@ int yaffsfs_IsPathDivider(YCHAR ch)
 	return 0;
 }
 
+int yaffsfs_CheckNameLength(const char *name)
+{
+	int retVal = 0;		
 
+	int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1);
+		
+	if(nameLength == 0){
+		yaffsfs_SetError(-ENOENT);
+		retVal = -1;
+	} else if (nameLength > YAFFS_MAX_NAME_LENGTH){
+		yaffsfs_SetError(-ENAMETOOLONG);
+		retVal = -1;
+	}
+
+	return retVal;	
+}
 
 LIST_HEAD(yaffsfs_deviceList);
 
@@ -382,48 +397,6 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPat
 	return retval;
 }
 
-#if 0
-static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
-{
-	yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
-	const YCHAR *leftOver;
-	const YCHAR *p;
-	struct yaffs_dev *retval = NULL;
-	int thisMatchLength;
-	int longestMatch = -1;
-
-	/*
-	 * Check all configs, choose the one that:
-	 * 1) Actually matches a prefix (ie /a amd /abc will not match
-	 * 2) Matches the longest.
-	 */
-	while(cfg && cfg->prefix && cfg->dev){
-		leftOver = path;
-		p = cfg->prefix;
-		thisMatchLength = 0;
-
-		while(*p &&  /* unmatched part of prefix */
-		      !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) &&
-		      *leftOver && yaffsfs_Match(*p,*leftOver)){
-			p++;
-			leftOver++;
-			thisMatchLength++;
-		}
-
-
-		if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) &&  /* end of prefix */
-		   (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && /* no more in this path name part */
-		   (thisMatchLength > longestMatch)){
-			/* Matched prefix */
-			*restOfPath = (YCHAR *)leftOver;
-			retval = cfg->dev;
-			longestMatch = thisMatchLength;
-		}
-		cfg++;
-	}
-	return retval;
-}
-#endif
 
 static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
@@ -1048,13 +1021,14 @@ int yaffs_truncate(const YCHAR *path,off_t new_size)
 	else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
 		yaffsfs_SetError(-EISDIR);
 	else if(obj->my_dev->read_only)
+		yaffsfs_SetError(-EACCES);
+	else if(new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE)
 		yaffsfs_SetError(-EINVAL);
 	else
 		result = yaffs_resize_file(obj,new_size);
 
 	yaffsfs_Unlock();
 
-
 	return (result) ? 0 : -1;
 }
 
@@ -1072,13 +1046,14 @@ int yaffs_ftruncate(int fd, off_t new_size)
 		/* bad handle */
 		yaffsfs_SetError(-EBADF);
 	else if(obj->my_dev->read_only)
+		yaffsfs_SetError(-EACCES);
+	else if( new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE)
 		yaffsfs_SetError(-EINVAL);
 	else
 		/* resize the file */
 		result = yaffs_resize_file(obj,new_size);
 	yaffsfs_Unlock();
 
-
 	return (result) ? 0 : -1;
 
 }
@@ -1192,8 +1167,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 		yaffsfs_SetError(-EINVAL);
 		rename_allowed = 0;
 	} else if(olddir->my_dev != newdir->my_dev) {
-		/* oops must be on same device */
-		/* todo error */
+		/* Rename must be on same device */
 		yaffsfs_SetError(-EXDEV);
 		rename_allowed = 0;
 	} else if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) {
@@ -1682,6 +1656,11 @@ int yaffs_access(const YCHAR *path, int amode)
 
 	int retval = 0;
 
+	if(amode & ~(R_OK | W_OK | X_OK)){
+		yaffsfs_SetError(-EINVAL);
+		return -1;
+	}
+
 	yaffsfs_Lock();
 
 	obj = yaffsfs_FindObject(NULL,path,0,1);
@@ -1844,7 +1823,7 @@ int yaffs_mount2(const YCHAR *path,int read_only)
 	struct yaffs_dev *dev=NULL;
 	YCHAR *dummy;
 
-	T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+	T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
 	yaffsfs_Lock();
 
@@ -2296,7 +2275,6 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 	struct yaffs_obj *obj = NULL;
 	int retVal;
 
-
 	yaffsfs_Lock();
 
 	obj = yaffsfs_FindObject(NULL,path,0,1);
@@ -2323,8 +2301,6 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 	struct yaffs_obj *obj = NULL;
 	struct yaffs_obj *target = NULL;
 	int retVal = 0;
-	int new_nameLength = 0;
-
 
 	yaffsfs_Lock();
 
@@ -2356,15 +2332,7 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 			retVal = -1;
 		}
 		
-		new_nameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1);
-		
-		if(new_nameLength == 0){
-			yaffsfs_SetError(-ENOENT);
-			retVal = -1;
-		} else if (new_nameLength > YAFFS_MAX_NAME_LENGTH){
-			yaffsfs_SetError(-ENAMETOOLONG);
-			retVal = -1;
-		}
+		retVal = yaffsfs_CheckNameLength(newname);
 		
 		if(retVal == 0) {
 			link = yaffs_link_obj(newdir,newname,obj);