diff --git a/file_tree.save b/file_tree.save index 0a0897c..ff35455 100644 --- a/file_tree.save +++ b/file_tree.save @@ -159,6 +159,22 @@ 20:45:04=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14=mkdir s15 20:45:15=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=mkdir test_1 20:45:19=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=mkdir test_2 -20:45:26=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=touch test 20:45:32=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=touch test.exe 20:45:40=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=touch exe.exe +21:04:17=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=touch haha.bat +21:04:24=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=touch haha.bate +/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=rm -r haha.bat +21:05:18=06/26/22=/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=touch haha.bat +/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=rm -r haha.bate +21:14:11=06/26/22=/=touch another_file_for_test_input_max.filelength +21:21:46=06/26/22=/=touch hehe +21:22:03=06/26/22=/=touch kh.a +/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=rm +/=rm +22:11:05=06/26/22=/s1/s2/s3=touch megafile.a +22:13:08=06/26/22=/=touch makefile.file +06/26/22=20:43:03=/s1/s2/s3=mkdir s4 +06/26/22=20:43:03=/s1/s2/s3=mkdir s4 +22:18:56=06/26/22=/s1/s2/s3=touch makefile.file +22:18:56=06/26/22=/s1/s2/s3=touch makefile.file +/s1/s2/s3/s4/s5/s6/s7/s8/s9/s10/s11/s12/s13/s14/s15=rm -r test_1 diff --git a/save.h b/save.h deleted file mode 100644 index b4bd486..0000000 --- a/save.h +++ /dev/null @@ -1,27 +0,0 @@ -#include "include/ui.h" -#include -#include "structs.h" - -#define SAVEFILENAME "save.dat" - -FILE *SAVE; - -int newRecord(char *time, char *date, Folder *folder, char *command) -{ - SAVE = fopen(SAVEFILENAME, "a"); - - if (SAVE == NULL) - { - printf("Unable to open %s\n", SAVEFILENAME); - } - - if (time != NULL) - { - fprintf(SAVE, "%s$%s$", time, date); - } - - save_path(folder, NULL, SAVE); - fprintf(SAVE, "$%s", command); - - fclose(SAVE); -} \ No newline at end of file diff --git a/structs.c b/structs.c index 153049b..c180d4d 100644 --- a/structs.c +++ b/structs.c @@ -19,6 +19,9 @@ int check_name(char *name) if (name[strln - 1] == '.') return FILENAME_ENDING_FAILURE; + if (strln == 0) + return FILENAME_LENGTH_FAILURE; + return SUCCESS; } @@ -41,6 +44,9 @@ int check_ext(char *ext) if (ext[strln - 1] == '.') return FILENAME_ENDING_FAILURE; + if (strln == 0) + return FILENAME_LENGTH_FAILURE; + return SUCCESS; } @@ -242,12 +248,12 @@ int print_list(Folder *fld, int mode) for (i = 0; i < fld->files_count_cur; i++) printf("│ %s │ %s │ %*s │ %*s │\n", fld->files[i].creation_time, fld->files[i].creation_date, filename_lenth, fld->files[i].filename, extinsion_lenth, fld->files[i].extension); - printf("├──────────┼──────────┼────────────────────────────────────────────────────┼────────────┘\n"); - printf("│ Time │ Date │ Foldernames │\n"); - printf("├──────────┼──────────┼────────────────────────────────────────────────────┤\n"); + printf("├──────────┼──────────┼────────────────────────────────────────────────────┼────────────┤\n"); + printf("│ Time │ Date │ Foldernames │ Contains │\n"); + printf("├──────────┼──────────┼────────────────────────────────────────────────────┼────────────┤\n"); for (i = 0; i < fld->folders_count_cur; i++) - printf("│ %s │ %s │ %*s │\n", fld->folders[i].creation_time, fld->folders[i].creation_date, filename_lenth, fld->folders[i].filename); - printf("└──────────┴──────────┴────────────────────────────────────────────────────┘\n"); + printf("│ %s │ %s │ %*s │ %*d │\n", fld->folders[i].creation_time, fld->folders[i].creation_date, filename_lenth, fld->folders[i].filename, 10, fld->folders[i].exists_into); + printf("└──────────┴──────────┴────────────────────────────────────────────────────┴────────────┘\n"); } } @@ -270,6 +276,7 @@ void delete_file(File *deleting) parent->files[i] = parent->files[i + 1]; } parent->files_count_cur--; + parent->exists_into--; } } @@ -308,6 +315,7 @@ void delete_folder(Folder *deleting) parent->folders[i] = parent->folders[i + 1]; } parent->folders_count_cur--; + parent->exists_into--; } // print_list(deleting->parent, 1); } diff --git a/work1 b/work1 index 78ae0a7..6a55115 100755 Binary files a/work1 and b/work1 differ