X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_stat.c;h=d379944d769b4e27d61c1411b71a86edb4fd8aa0;hp=0d972a61cfe9f3f12e6286c7ae2569329d977d1c;hb=4f90d524e3c666c53ae36ad2911e00e5b3741cca;hpb=90c66937f76d1e4ce1fb43aed91219c4f1e443f1

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.c b/direct/timothy_tests/quick_tests/test_yaffs_stat.c
index 0d972a6..d379944 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_stat.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_stat.c
@@ -1,29 +1,54 @@
+/*
+ * 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_stat.h"
 
 int test_yaffs_stat(void){
 	int mode=0;
 	int size=0;
 	mode =yaffs_test_stat_mode();
-	printf("\nmode %o\n",mode);
-	printf("expected mode %o \n",FILE_MODE);
-	printf("anding together %o\n",FILE_MODE & mode);
-	printf("%d\n",FILE_MODE == (FILE_MODE & mode));
-	if (FILE_MODE == (FILE_MODE & mode)){
-		mode=1;
+	
+	if (mode>=0){
+	
+		if (FILE_MODE == (FILE_MODE & mode)){
+			mode=1;
+		}
+		else {
+			printf("mode did not match expected file mode\n");
+			return -1;
+		}
 	}
 	else {
-		printf("mode did not match expected file mode\n");
-		return -1;
+		mode =-1;
 	}
-	if (yaffs_test_stat_size()==FILE_SIZE){
-		size=1;
+
+	size=yaffs_test_stat_size();
+	if (size >=0){
+		if (size==FILE_SIZE){
+			size=1;
+		}
+		else {
+			printf("file size %d, expected file size %d\n",size,FILE_SIZE);
+			printf("mode did not match expected file mode\n");
+			return -1;
+		}
 	}
 	else {
-		printf("mode did not match expected file mode\n");
-		return -1;
-	}
-	
-	if (mode && size){
+		size =-1;
+	}	
+
+
+	if ((mode>0) && (size>0)){
 		return 1;
 	}
 	else {
@@ -41,12 +66,12 @@ int yaffs_test_stat_mode(void){
 	struct yaffs_stat stat;
 	int output=0;
 	output=yaffs_stat(FILE_PATH, &stat);
-	printf("output: %d\n",output);
+	//printf("output: %d\n",output);
 	if (output>=0){
 		return stat.st_mode;	
 	}
 	else {
-		printf("failed to stat file\n") ;
+		printf("failed to stat file mode\n") ;
 		return -1;
 	}
 }
@@ -59,7 +84,7 @@ int yaffs_test_stat_size(void){
 		return stat.st_size;	
 	}
 	else {
-		printf("failed to stat file\n") ;
+		printf("failed to stat file size\n") ;
 		return -1;
 	}
 }