dorian/gra-projekt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: File reading

Browse source
This commit is contained in:
Dorian Zedler 2022-06-29 20:54:41 +02:00
parent 9133601088
commit 9f91eb3962
Signed by: dorian
GPG key ID: 989DE36109AFA354
5 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

@ -9,7 +9,8 @@
"optional": "c", "optional": "c",
"string_view": "c", "string_view": "c",
"system_error": "c", "system_error": "c",
"variant": "c" "variant": "c",
"array": "c"
}, },
"editor.formatOnSave": true "editor.formatOnSave": true
} }

4
Implementierung/lib/io.h
View file

@ -2,6 +2,7 @@
#define IO_H #define IO_H
#include <errno.h> #include <errno.h>
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -11,9 +12,10 @@
* @brief reads a file at a path * @brief reads a file at a path
* *
* @param path the filepath * @param path the filepath
* @param data where to store the pointer to the data
* @param size a pointer where the size of the result should be stored * @param size a pointer where the size of the result should be stored
* @return the raw data * @return the raw data
*/ */
uint8_t* read_file(const char* path, size_t* size); bool read_file(const char* path, uint8_t** data, size_t* size);
#endif // IO_H #endif // IO_H

20
Implementierung/src/io.c
View file

@ -1,13 +1,13 @@
#include "io.h" #include "io.h"
uint8_t* read_file(const char* path, size_t* size) { bool read_file(const char* path, uint8_t** data, size_t* size) {
// Read the contents of the file specified by path into a heap-allocated // Read the contents of the file specified by path into a heap-allocated
// buffer and return a pointer to that buffer. // buffer and return a pointer to that buffer.
FILE* f = fopen(path, "r"); FILE* f = fopen(path, "r");
if (f == NULL) { if (f == NULL) {
printf("Fopen error: %d\n", errno); printf("Fopen error: %d\n", errno);
fclose(f); fclose(f);
return NULL; return false;
} }
struct stat statOfFile; struct stat statOfFile;
@ -15,28 +15,28 @@ uint8_t* read_file(const char* path, size_t* size) {
if (status == -1) { if (status == -1) {
printf("Fstat error: %d\n", errno); printf("Fstat error: %d\n", errno);
fclose(f); fclose(f);
return NULL; return false;
}; };
if ((statOfFile.st_mode & S_IFMT) != S_IFREG) { if ((statOfFile.st_mode & S_IFMT) != S_IFREG) {
printf("File is not a regular file!\n"); printf("File is not a regular file!\n");
fclose(f); fclose(f);
return NULL; return false;
} }
uint8_t* data = malloc(statOfFile.st_size); (*data) = malloc(statOfFile.st_size);
size_t bytesRead = size_t bytesRead =
fread(data, statOfFile.st_blksize, statOfFile.st_blocks, f); fread((*data), statOfFile.st_blksize, statOfFile.st_blocks, f);
// Or: size_t bytesRead = fread(data, sizeof(char), statOfFile.st_size, f); // size_t bytesRead = fread(data, sizeof(uint8_t), statOfFile.st_size, f);
if (bytesRead != 0 && !feof(f)) { if (bytesRead != 0 && !feof(f)) {
printf("Error reading file!\n"); printf("Error reading file!\n");
fclose(f); fclose(f);
return NULL; return false;
} }
fclose(f); fclose(f);
(*size) = bytesRead; (*size) = statOfFile.st_size;
return data; return true;
} }

22
Implementierung/src/main.c
View file

@ -65,19 +65,23 @@ int main(int argc, char** argv) {
"benchmark cycles: %d\n", "benchmark cycles: %d\n",
c.filename, c.implementationToUse, c.doBenchmark, c.benchmarkingCycles); c.filename, c.implementationToUse, c.doBenchmark, c.benchmarkingCycles);
runTests(); // runTests();
/*size_t len; size_t len;
uint8_t* data = read_file(c.filename, &len); uint8_t* data;
if (!read_file(c.filename, &data, &len)) {
printf("Error reading file %s!", c.filename);
return EXIT_FAILURE;
}
printf("File read with size: %zu\n", len);
printf("\n");
uint8_t out[16]; uint8_t out[16];
const char* test = "abcdefghijklmnopqrstuvwxyz"; md2_hash(len, data, out);
len = strlen(test);
md2_hash(len, test, out);
printf("Hash: "); printf("Hash: ");
const char hash[16]; char hash[16];
encodeHash(out, &hash); encodeHash(out, hash);
printf("%s\n", hash);*/ printf("%s\n", hash);
return 0; return 0;
} }

36
Implementierung/src/md2.c
View file

@ -5,23 +5,23 @@
// Source: https://datatracker.ietf.org/doc/html/rfc1319 // Source: https://datatracker.ietf.org/doc/html/rfc1319
static unsigned char PI_SUBST[256] = { static unsigned char PI_SUBST[256] = {
41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, 76, 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, 76,
130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, 138, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, 138,
23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, 245, 142, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, 245, 142,
187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, 148, 194, 16, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, 148, 194, 16,
137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, 39, 53, 62, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, 39, 53, 62,
204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, 181, 209, 215, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, 181, 209, 215,
94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, 150, 164, 125, 182, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, 150, 164, 125, 182,
118, 252, 107, 226, 156, 116, 4, 241, 69, 157, 112, 89, 100, 113, 135, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, 112, 89, 100, 113, 135,
32, 134, 91, 207, 101, 230, 45, 168, 2, 27, 96, 37, 173, 174, 176, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, 96, 37, 173, 174, 176,
185, 246, 28, 70, 97, 105, 52, 64, 126, 15, 85, 71, 163, 35, 221, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, 85, 71, 163, 35, 221,
81, 175, 58, 195, 92, 249, 206, 186, 197, 234, 38, 44, 83, 13, 110, 81, 175, 58, 195, 92, 249, 206, 186, 197, 234, 38, 44, 83, 13, 110,
133, 40, 132, 9, 211, 223, 205, 244, 65, 129, 77, 82, 106, 220, 55, 133, 40, 132, 9, 211, 223, 205, 244, 65, 129, 77, 82, 106, 220, 55,
200, 108, 193, 171, 250, 36, 225, 123, 8, 12, 189, 177, 74, 120, 136, 200, 108, 193, 171, 250, 36, 225, 123, 8, 12, 189, 177, 74, 120, 136,
149, 139, 227, 99, 232, 109, 233, 203, 213, 254, 59, 0, 29, 57, 242, 149, 139, 227, 99, 232, 109, 233, 203, 213, 254, 59, 0, 29, 57, 242,
239, 183, 14, 102, 88, 208, 228, 166, 119, 114, 248, 235, 117, 75, 10, 239, 183, 14, 102, 88, 208, 228, 166, 119, 114, 248, 235, 117, 75, 10,
49, 68, 80, 180, 143, 237, 31, 26, 219, 153, 141, 51, 159, 17, 131, 49, 68, 80, 180, 143, 237, 31, 26, 219, 153, 141, 51, 159, 17, 131,
20}; 20};
void printBuf(size_t len, uint8_t buf[len]) { void printBuf(size_t len, uint8_t buf[len]) {
@ -55,7 +55,7 @@ void md2_hash(size_t len, const uint8_t buf[len], uint8_t out[16]) {
uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t)); uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t));
memcpy(newBuf, buf, len - paddingNeeded); memcpy(newBuf, buf, len - paddingNeeded);
printBuf(len + 16, newBuf); // printBuf(len + 16, newBuf);
while (paddingNeeded > 0) { while (paddingNeeded > 0) {
newBuf[len - paddingNeeded] = originalPadding; newBuf[len - paddingNeeded] = originalPadding;