X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_read_EINVAL.c;h=101c458a4bd6bf68b7dbe3f94dd8fc5453c448c9;hp=e3ce96667c53ac0113d892cb88f4ee3752c9515e;hb=00ebf30805d631cd9bb3155aa249705b3a5777f5;hpb=a32621e0d7f5f391e9152cfe710fa6c99ca44c50

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c b/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
index e3ce966..101c458 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Timothy Manning <timothy@yaffs.net>
@@ -19,8 +19,8 @@ static char *file_name = NULL;
 int test_yaffs_read_EINVAL(void)
 {
 	int error_code = 0;
-	handle=test_yaffs_open();
-	char text[2000000]="\0";
+	handle=yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE);
+	char text[2000000];
 	int output=0;	
 	
 	if (handle<0){
@@ -59,7 +59,29 @@ int test_yaffs_read_EINVAL_clean(void)
 {
 	int output=0;
 	if (handle>=0){
-		output=test_yaffs_read_EINVAL_init_clean();
+		if(file_name){
+			free(file_name);
+			file_name = NULL;
+		}
+
+		
+		output= yaffs_truncate(FILE_PATH,FILE_SIZE );	
+		if (output>=0){
+			output=test_yaffs_write();
+			if (output<0){
+				print_message("failed to write to file\n",2);
+				return -1;
+			} else {
+				output=test_yaffs_write_clean();
+				if (output<0){
+					print_message("failed to clean the write_to_file function\n",2);
+				}
+			}
+		} else {
+			print_message("failed to truncate file\n",2);
+			return -1;
+		}
+
 		if(output>=0){
 			output=yaffs_close(handle);
 			if (output>=0){
@@ -74,6 +96,7 @@ int test_yaffs_read_EINVAL_clean(void)
 		}
 	} else {
 		print_message("no open handle\n",2);
+		return -1;	
 	}
 }
 
@@ -90,7 +113,7 @@ int test_yaffs_read_EINVAL_init(void)
 		return -1;
 	}
 	
-	strcat(file_name,YAFFS_MOUNT_POINT);
+	strcpy(file_name,YAFFS_MOUNT_POINT);
 	for (x=strlen(YAFFS_MOUNT_POINT); x<file_name_length -1; x++){
 		file_name[x]='a';
 	}
@@ -115,28 +138,4 @@ int test_yaffs_read_EINVAL_init(void)
 	
 }
 
-int test_yaffs_read_EINVAL_init_clean(void)
-{
-	int output=1;
-	if(file_name){
-		free(file_name);
-		file_name = NULL;
-	}
-
-	
-	output= yaffs_truncate(FILE_PATH,FILE_SIZE );	
-	if (output>=0){
-		output=test_yaffs_write();
-		if (output>=0){
-			return 1;
-		} else {
-			print_message("failed to write to file\n",2);
-			return -1;
-		}
-	} else {
-		print_message("failed to truncate file\n",2);
-		return -1;
-	}
-
-}