X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_lseek.c;h=98809c07a1a9f0216e663bd2f558f8b5b825db5b;hb=4f90d524e3c666c53ae36ad2911e00e5b3741cca;hp=d84bd512949921074e225afcbdce7ef95a75003f;hpb=6bdb202d06f1e3dc8cc00dea708ebbd7fb771342;p=yaffs2.git

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek.c b/direct/timothy_tests/quick_tests/test_yaffs_lseek.c
index d84bd51..98809c0 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_lseek.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_lseek.c
@@ -1,15 +1,35 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Timothy Manning <timothy@yaffs.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
 #include "test_yaffs_lseek.h"
 
+static int handle=0;
 int test_yaffs_lseek(void){
-	int handle=test_open_file();
-	char text[20]="\0";
+	handle=test_yaffs_open();
 	int output=0;
-	if (handle>0){
-		if (0==yaffs_lseek(handle, 0, SEEK_SET)){
+	if (handle>=0){
+		output=yaffs_lseek(handle, 0, SEEK_SET);
+		if (output==0){
 			return 1;
 		}
 		else {
-			printf("lseek returned a different position to the expeced position\n");
+			if (output<0){
+				printf("lseek failed to seek\n");
+			}
+			else {
+				printf("lseek returned a different position to the expeced position\n");
+				return -1;
+			}
 		}
 	}
 	else {
@@ -20,21 +40,14 @@ int test_yaffs_lseek(void){
 }
 
 int test_yaffs_lseek_clean(void){
-	/* need to reset the seek position*/
-	return test_yaffs_lseek_to_beginning();	
-}
-int test_yaffs_lseek_to_beginning(void){
-	int handle=test_open_file();
-	if (handle>0){
-		if (0==yaffs_lseek(handle, 0, SEEK_SET)){	/*lseek returns the position of the seeker */
-			return 1;
-		}
-		else {
-			printf("lseek returned a different position to the expeced position\n");
-		} 
+	if (handle>=0){
+		return yaffs_close(handle);
 	}
 	else {
-		printf("error opening file\n");
-		return -1;
+		return 1; /* no handle was opened so there is no need to close a handle */
 	}
+
 }
+
+
+