From: Timothy Manning <tfhmanning@gmail.com>
Date: Thu, 4 Nov 2010 20:44:05 +0000 (+1300)
Subject: yaffs Changed the logical error handling paths in yaffsfs.c
X-Git-Tag: linux-mainline-patchset-4~114
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=81ea50c07a64dc33f1c0556fdbd836e50b143625

yaffs Changed the logical error handling paths in yaffsfs.c

Restructed the yaffs_open() function to handle errors caused by not using O_CREATE.
Also added  a new yaffs_set_error() function to yaffsfs.c and yaffsfs.h.
An annoying printf in yaffs_fileem2k.c was commented out.
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
---

diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c
index 06e41e5..51c3aa4 100644
--- a/direct/basic-test/yaffs_fileem2k.c
+++ b/direct/basic-test/yaffs_fileem2k.c
@@ -536,7 +536,7 @@ int yflash2_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
 		
 	CheckInit();
 	
-	printf("erase block %d\n",blockNumber);
+	//printf("erase block %d\n",blockNumber);
 	
 	if(blockNumber == 320)
 		fail320 = 1;
diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index b187142..3cd532e 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -641,6 +641,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 */
@@ -655,7 +656,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;
@@ -668,8 +669,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;
@@ -704,20 +711,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);
 
@@ -743,10 +769,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;
 		}
 	}
@@ -2383,6 +2407,13 @@ 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
diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h
index 50b5cbc..e9e40f9 100644
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@ -171,6 +171,7 @@ void yaffs_add_device(struct yaffs_dev *dev);
 
 int yaffs_start_up(void);
 int yaffsfs_GetLastError(void);
+int yaffs_set_error(int error);
 /* Function to get the last error */
 int yaffs_get_error(void);