diff options
Diffstat (limited to 'c_implementation/src/ak_fs.c')
| -rw-r--r-- | c_implementation/src/ak_fs.c | 102 |
1 files changed, 25 insertions, 77 deletions
diff --git a/c_implementation/src/ak_fs.c b/c_implementation/src/ak_fs.c index 1d30744..6594f2d 100644 --- a/c_implementation/src/ak_fs.c +++ b/c_implementation/src/ak_fs.c @@ -12,7 +12,7 @@ char* ak_fs_return_hash_path(const char* str) { - if ( ak_fs_verify_input_is_hash(str) ) + if ( ak_fs_verify_input_is_hash(str, strlen(str)) ) { unsigned int i = 0; char *result = malloc((128*2)+1); @@ -43,7 +43,7 @@ char* ak_fs_return_hash_path(const char* str) char* ak_fs_return_hash_dir(const char* str) { - if ( ak_fs_verify_input_is_hash(str) ) + if ( ak_fs_verify_input_is_hash(str, strlen(str)) ) { unsigned int i = 0; char *result = malloc((128*2)+1); @@ -69,19 +69,23 @@ char* ak_fs_return_hash_dir(const char* str) } } -bool ak_fs_verify_input_is_hash(const char* str) +bool ak_fs_verify_input_is_hash(const char* str, size_t len) { size_t i = 0; + if (len != 128) + { + return false; + } while ( str[i] != '\0' ) { if ( i < 128 && !( ( str[i] >= 0x30 ) && - (( str[i] <= 0x39) || ( str[i] >= 0x61 )) && + ( str[i] <= 0x39 || str[i] >= 0x61 ) && ( str[i] <= 0x66 ) - ) - ) + ) + ) { return false; } @@ -107,7 +111,7 @@ int ak_fs_create_dir_for_hash(const char* str) * 2. We might need to "lock" onto some version of glibc and be aware of * other systems that do not use that one. */ - if ( ak_fs_verify_input_is_hash(str) ) + if ( ak_fs_verify_input_is_hash(str, strlen(str)) ) { char* dir_path = ak_fs_return_hash_dir(str); // We will need to separate the string so we can create the path one @@ -180,12 +184,10 @@ int ak_fs_convert_map_v3_string_to_struct(const char *str, size_t ssize, akfs_ma { if ( str[i] == ' ' ) { - // spaces_found++; sa[++spaces_found] = i; } if ( str[i] == '\n' ) { - // newlines_found++; na[++newlines_found] = i; } } @@ -196,7 +198,7 @@ int ak_fs_convert_map_v3_string_to_struct(const char *str, size_t ssize, akfs_ma si++; } original_hash_str[si] = '\0'; - if( !ak_fs_verify_input_is_hash(original_hash_str) ) + if( !ak_fs_verify_input_is_hash(original_hash_str, strlen(original_hash_str)) ) { ak_log_error(__func__, "original_hash_str not a hash"); return 1; @@ -213,7 +215,7 @@ int ak_fs_convert_map_v3_string_to_struct(const char *str, size_t ssize, akfs_ma si++; } root_hash_str[si] = '\0'; - if( !ak_fs_verify_input_is_hash(root_hash_str) ) + if( !ak_fs_verify_input_is_hash(root_hash_str, strlen(root_hash_str)) ) { ak_log_error(__func__, "root_hash_str not a hash"); return 1; @@ -237,56 +239,26 @@ int ak_fs_convert_map_v3_string_to_struct(const char *str, size_t ssize, akfs_ma return 0; } -void ak_fs_get_available_maps_from_fs(sha512sum **ma, size_t length) +void ak_fs_maps_v3_get_from_fs(akfs_map_v3 **ma, size_t length) { + (void)length; DIR *d; d = opendir(ak_fs_maps_v3_get_dir()); - sha512sum *ptr = NULL; + akfs_map_v3 *ptr = NULL; + ptr = *ma; if (d) { - for ( ptr = *ma; ptr < *ma+length; ++ptr) + const struct dirent *dir; + while((dir = readdir(d)) != NULL ) { - const struct dirent *dir; - if ((dir = readdir(d)) == NULL ) break; - if (!ak_fs_verify_input_is_hash(dir->d_name)) continue; - ak_fs_sha512sum_string_to_struct(dir->d_name, ptr); + if (!ak_fs_verify_input_is_hash(dir->d_name, 128)) continue; + ak_fs_sha512sum_string_to_struct(dir->d_name, &(ptr->mh)); + ++ptr; } } closedir(d); } -int ak_fs_map_v3_resolve_maps(akfs_map_v3 **ms, size_t ms_len) -{ - akfs_map_v3 *ptr = NULL; - for ( ptr = *ms; ptr < *ms+ms_len; ++ptr) - { - if ( ak_fs_sha512sum_is_null(&(ptr->mh)) ) - { - continue; - } - if( ak_fs_map_v3_open_from_file(ptr) != 2) - { - ++(ptr); - continue; - } - else - { - ++(ptr); - // return 1; - } - } - return 0; -} - -// void ak_fs_print_available_maps(sha512sum **ma, size_t ma_len) -// { -// sha512sum *ptr = NULL; -// for ( ptr = *ma; ptr < *ma+ma_len; ++ptr) -// { -// ak_log_debug(__func__, ak_fs_sha512sum_struct_read_as_string(ptr)); -// } -// } - void ak_fs_init_string(char *str, size_t len) { for (size_t i = 0; i < len; ++i) @@ -295,38 +267,14 @@ void ak_fs_init_string(char *str, size_t len) } } -// void ak_fs_print_map_avail(const sha512sum* m) -// { -// printf(" .MA: %s\n", ak_fs_sha512sum_struct_read_as_string(m)); -// } -// -// void ak_fs_print_map_all_avail(sha512sum** m, size_t s) -// { -// sha512sum *ptr = NULL; -// for (ptr = *m; ptr < *m+s; ++ptr) -// { -// ak_fs_print_map_avail(ptr); -// } -// } - int ak_fs_ls() { size_t len = ak_fs_maps_v3_found_in_fs(); - printf("Found: %lu\n", len); akfs_map_v3 map_store[len]; akfs_map_v3* maps_ptr = &map_store[0]; - void* mps_start = &map_store[0]; - (void)mps_start; ak_fs_maps_v3_init(&maps_ptr, len); - ak_fs_maps_v3_print(&maps_ptr, len); - - // TODO Rename the following to "ak_fs_resolve_map_v3_array" or close to it - ak_fs_map_v3_resolve_maps(&maps_ptr, len); - - // TODO Decide what we should be printing - // Possibly, something like "maphex(6)_filename" so we can put multiple - // files with the same name into the list - ak_fs_maps_v3_print(&maps_ptr, len); - ak_fs_maps_v3_print_filenames(&maps_ptr, len); + ak_fs_maps_v3_get_from_fs(&maps_ptr, len); + ak_fs_maps_v3_resolve(&maps_ptr, len); + ak_fs_maps_v3_print_bif(&maps_ptr, len); return 0; } |