yaffs Fixed all of the bugs in direct/timothy_tests/mirror_tests

[yaffs2.git] / direct / timothy_tests / mirror_tests / mirror_tests.c

diff --git a/direct/timothy_tests/mirror_tests/mirror_tests.c b/direct/timothy_tests/mirror_tests/mirror_tests.c
index bcd9df53ab79d46853b1a9588498e19c94ea9bba..8c7574e4a2269267c43fe03ed7b02adb7d86d410 100644 (file)
--- a/direct/timothy_tests/mirror_tests/mirror_tests.c
+++ b/direct/timothy_tests/mirror_tests/mirror_tests.c
@@ -210,7 +210,7 @@ int run_random_test(int num_of_random_tests)
                //check_mode(&args_struct);
 
        } 
-       //compare_linux_and_yaffs(&args_struct);
+       compare_linux_and_yaffs(&args_struct);
 }
 
 int select_test_id(int test_len)
@@ -284,6 +284,8 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
        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;
@@ -301,8 +303,8 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 //     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 != NULL) {
-               for (x=0;NULL!=yaffs_readdir(yaffs_open_dir);x++){}
+       if (yaffs_open_dir) {
+               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);
@@ -311,17 +313,22 @@ 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 !=NULL){
+       if (yaffs_open_dir){
                yaffs_current_file =yaffs_readdir(yaffs_open_dir);
-               for (x=0 ;NULL!=yaffs_current_file;x++)
+               for (x=0 ;yaffs_current_file;x++)
                {
-
-                       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);
                }
@@ -333,9 +340,9 @@ 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!=NULL){
-               for (x=0;NULL!=readdir(linux_open_dir);x++){}
-               number_of_files_in_linux=x-2;
+       if (linux_open_dir){
+               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. 
@@ -346,21 +353,26 @@ 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!=NULL){
+       if (linux_open_dir){
                linux_current_file =readdir(linux_open_dir);
-               for (x=0, y=0 ;NULL!=linux_current_file;x++)
+               for (x=0, y=0 ;linux_current_file;x++)
                {
 
-                       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(file_name,linux_current_file->d_name);
@@ -368,9 +380,9 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
                                //print_message(3,message);
                                print_message(7,"added file to list\n");
                                strcpy(linux_file_list[y],file_name);
-                               y++;
-                               sprintf(message,"file added to list: %s\n",linux_file_list[x]);
+                               sprintf(message,"file added to list: %s\n",linux_file_list[y]);
                                print_message(7,message);
+                               y++;
                        }
                        linux_current_file =readdir(linux_open_dir);
                }
@@ -429,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;
@@ -446,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();
@@ -454,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;
 
 }