Skip to content
Snippets Groups Projects
Commit 91dec9d4 authored by U-BASIS\dsmyda's avatar U-BASIS\dsmyda
Browse files

Fixed indentation and updated comment

parent 81cb7ae5
Branches
Tags
No related merge requests found
...@@ -222,25 +222,25 @@ TskAutoDb::addImageDetails(const char* deviceId) ...@@ -222,25 +222,25 @@ TskAutoDb::addImageDetails(const char* deviceId)
sha1 = ewf_info->sha1hash; sha1 = ewf_info->sha1hash;
} }
//Need 1MB for libewf read and extra 100 bytes for header name and formatting //Need 1MB for libewf read and extra 100 bytes for header name and formatting
const size_t buffer_size = 1024100; const size_t buffer_size = 1024100;
char result[buffer_size]; char result[buffer_size];
//Populate all of the libewf header values for the acquisition details column //Populate all of the libewf header values for the acquisition details column
collectionDetails.append(libewf_read_description(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_description(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_case_number(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_case_number(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_evidence_number(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_evidence_number(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_examiner_name(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_examiner_name(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_notes(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_notes(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_model(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_model(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_serial_number(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_serial_number(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_device_label(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_device_label(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_version(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_version(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_platform(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_platform(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_acquired_date(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_acquired_date(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_system_date(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_system_date(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_acquiry_operating_system(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_acquiry_operating_system(ewf_info->handle, result, buffer_size));
collectionDetails.append(libewf_read_acquiry_software_version(ewf_info->handle, result, buffer_size)); collectionDetails.append(libewf_read_acquiry_software_version(ewf_info->handle, result, buffer_size));
} }
#endif #endif
......
...@@ -45,24 +45,25 @@ inline int is_blank(const char* str) { ...@@ -45,24 +45,25 @@ inline int is_blank(const char* str) {
} }
/** /**
* Reads the first 1 MB of the libewf header * Reads from libewf what is left in the buffer after the addition of the key and new line
*/ */
inline char* read_libewf_header_value(libewf_handle_t *handle, char* result_buffer, const size_t buffer_size, const uint8_t *identifier, size_t identifier_length, const char* key) { inline char* read_libewf_header_value(libewf_handle_t *handle, char* result_buffer, const size_t buffer_size, const uint8_t *identifier, size_t identifier_length, const char* key) {
result_buffer[0] = '\0'; result_buffer[0] = '\0';
strcpy(result_buffer, key); strcpy(result_buffer, key);
libewf_error_t * ewf_error; libewf_error_t * ewf_error;
size_t key_len = strlen(key); size_t key_len = strlen(key);
int result = libewf_handle_get_utf8_header_value(handle, identifier, identifier_length, (uint8_t *)(result_buffer + key_len), buffer_size - key_len, &ewf_error); //buffer_size - key_len - 1 for the new line at the end
if (result != -1 && !is_blank(result_buffer + key_len)) { int result = libewf_handle_get_utf8_header_value(handle, identifier, identifier_length, (uint8_t *)(result_buffer + key_len), buffer_size - key_len - 1, &ewf_error);
strcat(result_buffer, "\n"); if (result != -1 && !is_blank(result_buffer + key_len)) {
} else { strcat(result_buffer, "\n");
//if blank or error, return nothing! } else {
result_buffer[0] = '\0'; //if blank or error, return nothing!
} result_buffer[0] = '\0';
}
return result_buffer;
return result_buffer;
} }
inline char* libewf_read_description(libewf_handle_t *handle, char* result_buffer, const size_t buffer_size) { inline char* libewf_read_description(libewf_handle_t *handle, char* result_buffer, const size_t buffer_size) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment