X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=7a05c2192b4b2fdae5e2f3cb27267d96f5711c7d;hp=5c583b9d39d44c9de2f16205c2756ce8c65a8148;hb=105583dbe67bb27204f5b9cfc3692393b38831d2;hpb=757a553001be4016e9c5d8880648d3703f34b10e

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 5c583b9..7a05c21 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -31,7 +31,8 @@
 #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);
 static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
 
 unsigned int yaffs_wr_attempts;
@@ -67,6 +68,18 @@ static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
 static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
 static int yaffsfs_handlesInitialised;
 
+
+unsigned yaffs_set_trace(unsigned  tm) 
+{
+	yaffs_trace_mask = tm;
+	return yaffs_trace_mask;
+}
+
+unsigned yaffs_get_trace(void)
+{
+	return yaffs_trace_mask;
+}
+
 /*
  * yaffsfs_InitHandle
  * Inilitalise handle management on start-up.
@@ -261,11 +274,23 @@ 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);
+	}
+}
+
 
 
 
 /*
- *  Stuff to search for a directory from a path
+ *  Stuff to handle names.
  */
 
 
@@ -288,14 +313,29 @@ 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);
 
 /*
  * 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
  */
@@ -370,48 +410,16 @@ 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)
+/* FindMountPoint only returns a dev entry if the path is a mount point */
+static struct yaffs_dev *yaffsfs_FindMountPoint(const YCHAR *path)
 {
-	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;
+	struct yaffs_dev *dev;
+	YCHAR *restOfPath=NULL;
+	dev = yaffsfs_FindDevice(path,&restOfPath);
+	if(dev && restOfPath && *restOfPath)
+		dev = NULL;
+	return dev;
 }
-#endif
 
 static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
@@ -629,6 +637,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 			obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
 			obj = NULL;
 
+
 		if(obj){
 
 			/* The file already exists or it might be a directory */
@@ -643,7 +652,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 			/* Open should fail if O_CREAT and O_EXCL are specified since
 			 * the file exists
 			 */
-			if((oflag & O_EXCL) && (oflag & O_CREAT)){
+			if(!errorReported && (oflag & O_EXCL) && (oflag & O_CREAT)){
 				openDenied = 1;
 				yaffsfs_SetError(-EEXIST);
 				errorReported = 1;
@@ -656,8 +665,14 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 			if( writeRequested && !(obj->yst_mode & S_IWRITE))
 				openDenied = 1;
 
+			if(openDenied && !errorReported ) {
+				/* Error if the file exists but permissions are refused. */
+				yaffsfs_SetError(-EACCES);
+				errorReported = 1;
+			}
+
 			/* Check sharing of an existing object. */
-			{
+			if(!openDenied){
 				yaffsfs_Handle *hx;
 				int i;
 				sharedReadAllowed = 1;
@@ -692,20 +707,39 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 				}
 			}
 
-		} else if((oflag & O_CREAT)) {
-			/* Let's see if we can create this file */
+		}
+
+		/* If we could not open an existing object, then let's see if
+		 * the directory exists. If not, error.
+		 */
+		if(!obj && !errorReported){
 			dir = yaffsfs_FindDirectory(NULL,path,&name,0);
-			if(dir  && dir->my_dev->read_only){
+			if(!dir){
+				yaffsfs_SetError(-ENOTDIR);
+				errorReported = 1;
+			}
+		}
+
+		if(!obj && dir && !errorReported && (oflag & O_CREAT)) {
+			/* Let's see if we can create this file if it does not exist. */
+			if(dir->my_dev->read_only){
 				yaffsfs_SetError(-EINVAL);
 				errorReported = 1;
-			} else if(dir)
+			} else
 				obj = yaffs_create_file(dir,name,mode,0,0);
-			else {
-				yaffsfs_SetError(-ENOTDIR);
+
+			if(!obj && !errorReported){
+				yaffsfs_SetError(-ENOSPC);
 				errorReported = 1;
 			}
 		}
 
+		if(!obj && dir && !errorReported && !(oflag & O_CREAT)) {
+			/* Error if the file does not exist and CREAT is not set. */
+			yaffsfs_SetError(-ENOENT);
+			errorReported = 1;
+		}
+
 		if(obj && !openDenied) {
 			int inodeId = yaffsfs_GetInodeIdForObject(obj);
 
@@ -731,10 +765,8 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
                                 yaffs_resize_file(obj,0);
 		} else {
 			yaffsfs_PutHandle(handle);
-			if(!errorReported) {
-				yaffsfs_SetError(!obj ? -ENOSPC : -EACCES);
-				errorReported = 1;
-			}
+			if(!errorReported) 
+				yaffsfs_SetError(0); /* Problem */
 			handle = -1;
 		}
 	}
@@ -861,7 +893,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;
@@ -944,11 +985,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;
@@ -1012,13 +1063,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;
 }
 
@@ -1036,13 +1088,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;
 
 }
@@ -1156,8 +1209,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) {
@@ -1646,6 +1698,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);
@@ -1680,9 +1737,13 @@ int yaffs_access(const YCHAR *path, int amode)
 int yaffs_chmod(const YCHAR *path, mode_t mode)
 {
 	struct yaffs_obj *obj;
-
 	int retVal = -1;
 
+	if(mode & ~(0777)){
+		yaffsfs_SetError(-EINVAL);
+		return -1;
+	}
+
 	yaffsfs_Lock();
 
 	obj = yaffsfs_FindObject(NULL,path,0,1);
@@ -1690,7 +1751,7 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
 	if(!obj)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
-		yaffsfs_SetError(-EINVAL);
+		yaffsfs_SetError(-EROFS);
 	else
 		retVal = yaffsfs_DoChMod(obj,mode);
 
@@ -1704,16 +1765,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);
 
@@ -1806,15 +1871,14 @@ 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_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+	T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
 	yaffsfs_Lock();
 
 	yaffsfs_InitHandles();
 
-	dev = yaffsfs_FindDevice(path,&dummy);
+	dev = yaffsfs_FindMountPoint(path);
 	if(dev){
 		if(!dev->is_mounted){
 			dev->read_only = read_only ? 1 : 0;
@@ -1874,10 +1938,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;
@@ -1886,7 +1950,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 */
 			}
 
@@ -1914,10 +1980,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;
@@ -1927,11 +1992,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;
@@ -1943,8 +2011,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);
 
@@ -2260,7 +2327,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);
@@ -2287,8 +2353,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();
 
@@ -2320,15 +2384,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);
@@ -2348,6 +2404,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;
 }
 
@@ -2371,9 +2430,18 @@ int yaffs_get_error(void)
 	return yaffsfs_GetLastError();
 }
 
+int yaffs_set_error(int error)
+{
+	/*yaffsfs_SetError does not return. So the program is assumed to have worked. */
+	yaffsfs_SetError(error);
+	return 0;
+}
+
 int yaffs_dump_dev(const YCHAR *path)
 {
-#if 0
+#if 1
+	path=path;
+#else
 	YCHAR *rest;
 
 	struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);