X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fmirror_tests%2Fmirror_tests.c;h=8c7574e4a2269267c43fe03ed7b02adb7d86d410;hp=578409eb633cd734dc145fb5d2e02ecf8e2a4907;hb=f8c94ec8d6c218bc34f348b64d853521d03e6905;hpb=ca74a1a9eca8779e4edad2fc1274b281dc008deb

diff --git a/direct/timothy_tests/mirror_tests/mirror_tests.c b/direct/timothy_tests/mirror_tests/mirror_tests.c
index 578409e..8c7574e 100644
--- a/direct/timothy_tests/mirror_tests/mirror_tests.c
+++ b/direct/timothy_tests/mirror_tests/mirror_tests.c
@@ -279,10 +279,13 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	int x=0,y=0;
 	char l_path[200];
 	char y_path[200];
+	char file_name[200];
 	int exit_bool=0;
 	int number_of_files_in_yaffs=0;
 	int number_of_files_in_linux=0;
 	char message[200];
+	char **yaffs_file_list=NULL;
+	char **linux_file_list=NULL;
 
 	struct yaffs_stat yaffs_stat_struct;
 	struct stat linux_stat_struct;
@@ -292,12 +295,16 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	DIR *linux_open_dir;
 	struct dirent *linux_current_file;
 	
+	l_path[0]='\0';
+	y_path[0]='\0';
+	file_name[0]='\0';
+	message[0]='\0';
 	print_message(2,"\n\n\n comparing folders\n");
 //	check_mode_file("yaffs2/test/YY");
 	//find out the number of files in the directory
 	yaffs_open_dir = yaffs_opendir(yaffs_struct.root_path);
 	if (yaffs_open_dir) {
-		for (x=0;NULL!=yaffs_readdir(yaffs_open_dir);x++){}
+		for (x=0;yaffs_readdir(yaffs_open_dir);x++){}
 		number_of_files_in_yaffs=x;
 		sprintf(message,"number of files in yaffs dir= %d\n",number_of_files_in_yaffs);
 		print_message(2,message);
@@ -306,17 +313,24 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 		print_message(3,"failed to open yaffs test dir\n");
 	}
 	//create array
-	char yaffs_file_list[x][200];
+	yaffs_file_list= (char **)malloc(x*sizeof(char*));
+	for (x=0;x<number_of_files_in_yaffs;x++) {
+		yaffs_file_list[x]=malloc(200);
+	}
+
 	//check_mode_file("yaffs2/test/YY");
 	//copy file names into array
 	if (yaffs_open_dir){
-	
-		for (x=0 ;NULL!=yaffs_current_file;x++)
+		yaffs_current_file =yaffs_readdir(yaffs_open_dir);
+		for (x=0 ;yaffs_current_file;x++)
 		{
-			yaffs_current_file =yaffs_readdir(yaffs_open_dir);
-			if (NULL!=yaffs_current_file){
+			printf("x= %d \n",x);
+			printf("yaffs_current_file->d_name = %s\n",yaffs_current_file->d_name);
+			if (yaffs_current_file){
 				strcpy(yaffs_file_list[x],yaffs_current_file->d_name);
+
 			}
+			yaffs_current_file =yaffs_readdir(yaffs_open_dir);
 		}
 		yaffs_closedir(yaffs_open_dir);
 	} else {
@@ -327,8 +341,8 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	//find out the number of files in the directory
 	linux_open_dir = opendir(linux_struct.root_path);
 	if (linux_open_dir){
-		for (x=0;NULL!=readdir(linux_open_dir);x++){}
-		number_of_files_in_linux=x-2;
+		for (x=0;readdir(linux_open_dir);x++){}
+		number_of_files_in_linux=(x-2);
 		sprintf(message,"number of files in linux dir= %d\n",(number_of_files_in_linux));
 		print_message(2,message);
 		//the -2 is because linux shows 2 extra files which are automaticly created. 
@@ -339,31 +353,38 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	}
 
 	//create array
-	char linux_file_list[x-2][200];
+	linux_file_list= (char **)malloc(number_of_files_in_linux*sizeof(char*));
+	
+	for (x=0;x<number_of_files_in_linux;x++) {
+		linux_file_list[x]=malloc(200);
+	}
+
 	//check_mode_file("yaffs2/test/YY");
 	//copy file names into array
 	if (linux_open_dir){
-		for (x=0, y=0 ;NULL!=linux_current_file;x++)
+		linux_current_file =readdir(linux_open_dir);
+		for (x=0, y=0 ;linux_current_file;x++)
 		{
-			linux_current_file =readdir(linux_open_dir);
-			if (NULL!=linux_current_file){
+
+			if (linux_current_file){
 				strcpy(message,linux_current_file->d_name);
 				print_message(7,"opened file: ");
 				print_message(7,message);
 				print_message(7,"\n");
 			}
-			if (NULL!=linux_current_file && 
+			if (linux_current_file && 
 				0!=strcmp(message,".")&&
 				0!=strcmp(message,"..")){
-			//	strcpy(message,linux_current_file->d_name);
+				strcpy(file_name,linux_current_file->d_name);
 				//sprintf("file opened: %s\n",linux_current_file->d_name);
 				//print_message(3,message);
 				print_message(7,"added file to list\n");
-				strcpy(linux_file_list[y],message);
-				y++;
-				sprintf(message,"file added to list: %s\n",linux_file_list[x]);
+				strcpy(linux_file_list[y],file_name);
+				sprintf(message,"file added to list: %s\n",linux_file_list[y]);
 				print_message(7,message);
+				y++;
 			}
+			linux_current_file =readdir(linux_open_dir);
 		}
 		closedir(linux_open_dir);
 	} else {
@@ -402,6 +423,8 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 						print_message(2,"file modes do not match\n");
 						exit_bool=1;
 					}
+					linux_file_list[y][0]=NULL;
+					yaffs_file_list[x][0]=NULL;
 				} else {
 					print_message(2,"failed to stat one of the files\n");
 					get_error_yaffs();
@@ -410,8 +433,7 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 				
 				//read file contents
 				
-				linux_file_list[y][0]=NULL;
-				yaffs_file_list[x][0]=NULL;
+				
 				break;
 			}
 		}
@@ -419,14 +441,14 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 
 	//print remaining files
 	for (x=0;x<number_of_files_in_linux;x++){
-		if (linux_file_list[x][0]!=NULL){
+		if (linux_file_list[x][0]){
 			sprintf(message,"unmatched file in linux: %s\n",linux_file_list[x]);
 			print_message(2,message);
 			exit_bool=1;
 		}
 	}
 	for (x=0;x<number_of_files_in_yaffs;x++){
-		if (yaffs_file_list[x][0]!=NULL){
+		if (yaffs_file_list[x][0]){
 			sprintf(message,"unmatched file in yaffs: %s\n",yaffs_file_list[x]);
 			print_message(2,message);
 			exit_bool=1;
@@ -436,6 +458,18 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 		print_message(2,"exiting program\n");
 		exit(0);
 	}
+
+	for (x=0;x<number_of_files_in_yaffs;x++) {
+		free(yaffs_file_list[x]);
+	}
+	free(yaffs_file_list);
+
+	for (x=0;x<number_of_files_in_linux;x++) {
+		free(linux_file_list[x]);
+	}
+	free(linux_file_list);
+
+
 	//printf("file_name %s\n", yaffs_current_file->d_name);
 //	generate_array_of_objects_in_yaffs(); 
 //	generate_array_of_objects_in_linux();
@@ -444,6 +478,7 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	//read the text of each file and compare them.
 	
 	//show the diffrences by printing them. 
+	return 1;
 
 }