xfarrow
/
dircomp
mirror of https://github.com/xfarrow/dircomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code readability

This commit is contained in:
Alessandro Ferro 2023-04-17 00:06:26 +02:00
parent 9f7a6bd4f1
commit 23ea4813db
1 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
dircomp.c
View File

@ -115,6 +115,7 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
free(fullpath_file_helper); free(fullpath_file_helper);
free(directory_to_analyze_1); free(directory_to_analyze_1);
free(directory_to_analyze_2); free(directory_to_analyze_2);
closedir(directory);
return false; return false;
} }
} }
@ -153,6 +154,7 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
free( fullpath_file_helper2 ); free( fullpath_file_helper2 );
free( directory_to_analyze_1 ); free( directory_to_analyze_1 );
free( directory_to_analyze_2 ); free( directory_to_analyze_2 );
closedir(directory);
return false; return false;
} }
} }
@ -190,6 +192,7 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
free( fullpath_file_helper ); free( fullpath_file_helper );
free( directory_to_analyze_1 ); free( directory_to_analyze_1 );
free( directory_to_analyze_2 ); free( directory_to_analyze_2 );
closedir(directory);
return false; return false;
} }
} }
@ -224,57 +227,41 @@ bool analyze_directories(char* directory_to_analyze_1, char* directory_to_analyz
{ {
while ((element = readdir(directory)) != NULL) while ((element = readdir(directory)) != NULL)
{ {
// Is file if (element->d_type == DT_REG || element->d_type == DT_DIR)
if (element->d_type == DT_REG)
{ {
// Check wether it exists in directory1
fullpath_file_helper = malloc(sizeof(char) * (strlen(directory_to_analyze_1) + strlen(element->d_name) + 2) ); fullpath_file_helper = malloc(sizeof(char) * (strlen(directory_to_analyze_1) + strlen(element->d_name) + 2) );
strcpy(fullpath_file_helper, directory_to_analyze_1); strcpy(fullpath_file_helper, directory_to_analyze_1);
strcat(fullpath_file_helper, "/"); strcat(fullpath_file_helper, "/");
strcat(fullpath_file_helper, element->d_name); strcat(fullpath_file_helper, element->d_name);
if (access(fullpath_file_helper, F_OK) == -1) if(element->d_type == DT_REG){
{ if (access(fullpath_file_helper, F_OK) == -1)
is_directory_equal = false; {
if (arguments->v == true) is_directory_equal = false;
printf("File %s exists in %s but does not in %s\n" , element->d_name if (arguments->v == true)
printf("File %s exists in %s but does not in %s\n" , element->d_name
, directory_to_analyze_2 , directory_to_analyze_2
, directory_to_analyze_1); , directory_to_analyze_1);
if( arguments->f == true )
{
free( fullpath_file_helper );
free( directory_to_analyze_1 );
free( directory_to_analyze_2 );
return false;
} }
} }
free(fullpath_file_helper); else if(element->d_type == DT_DIR){
} struct stat dummy_structure; // no need to be malloc-ed, as it'll be automatically free-d as the call ends
if (stat(fullpath_file_helper, &dummy_structure) == -1)
// Is directory {
else if (element->d_type == DT_DIR) is_directory_equal = false;
{ if (arguments->v == true)
// Check wether a folder with the same name exists in directory1 printf("Sub-directory %s exists in %s but does not in %s\n" , element->d_name
fullpath_file_helper = malloc(sizeof(char) * (strlen(directory_to_analyze_1) + strlen(element->d_name) + 2) );
strcpy(fullpath_file_helper, directory_to_analyze_1);
strcat(fullpath_file_helper, "/");
strcat(fullpath_file_helper, element->d_name);
struct stat dummy_structure; // no need to be malloc-ed, as it'll be automatically free-d as the call ends
if (stat(fullpath_file_helper, &dummy_structure) == -1)
{
is_directory_equal = false;
if (arguments->v == true)
printf("Sub-directory %s exists in %s but does not in %s\n" , element->d_name
, directory_to_analyze_2 , directory_to_analyze_2
, directory_to_analyze_1); , directory_to_analyze_1);
if( arguments->f == true )
{
free( fullpath_file_helper );
free( directory_to_analyze_1 );
free( directory_to_analyze_2 );
return false;
} }
} }
free(fullpath_file_helper); free(fullpath_file_helper);
if( arguments->f == true && is_directory_equal == false)
{
free( directory_to_analyze_1 );
free( directory_to_analyze_2 );
return false;
}
} }
} }
closedir(directory); closedir(directory);