aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2021-10-30 04:22:07 +0200
committerdec05eba <dec05eba@protonmail.com>2021-10-30 04:22:07 +0200
commit8a316a12481282cb2ab966c4cbc770656c258383 (patch)
tree678b4efcaa4e47cb4f4d2bd29c90badbeac8789c /src
parent275e851e8a2b11c2efe7c39787bf331dd3b75272 (diff)
Add option to make mgl_file_load result null terminated
Diffstat (limited to 'src')
-rw-r--r--src/graphics/font.c2
-rw-r--r--src/graphics/shader.c2
-rw-r--r--src/system/fileutils.c9
3 files changed, 9 insertions, 4 deletions
diff --git a/src/graphics/font.c b/src/graphics/font.c
index 669c2ac..8344a04 100644
--- a/src/graphics/font.c
+++ b/src/graphics/font.c
@@ -22,7 +22,7 @@ int mgl_font_load_from_file(mgl_font *self, const char *filepath, unsigned int c
self->num_packed_chars = 0;
mgl_filedata filedata;
- if(mgl_load_file(filepath, &filedata) != 0) {
+ if(mgl_load_file(filepath, &filedata, NULL) != 0) {
fprintf(stderr, "Error: failed to load font %s, error: mgl_load_file failed\n", filepath);
return -1;
}
diff --git a/src/graphics/shader.c b/src/graphics/shader.c
index 4aedb87..9afde0e 100644
--- a/src/graphics/shader.c
+++ b/src/graphics/shader.c
@@ -71,7 +71,7 @@ static int mgl_shader_load_from_file(mgl_shader *self, const char *filepath, mgl
self->shader_type = shader_type;
mgl_filedata filedata;
- if(mgl_load_file(filepath, &filedata) != 0) {
+ if(mgl_load_file(filepath, &filedata, NULL) != 0) {
fprintf(stderr, "Error: failed to load shader %s, error: mgl_load_file failed\n", filepath);
return -1;
}
diff --git a/src/system/fileutils.c b/src/system/fileutils.c
index 7bd6859..dc8eaca 100644
--- a/src/system/fileutils.c
+++ b/src/system/fileutils.c
@@ -4,7 +4,9 @@
#include <unistd.h>
#include <stdlib.h>
-int mgl_load_file(const char *filepath, mgl_filedata *filedata) {
+int mgl_load_file(const char *filepath, mgl_filedata *filedata, mgl_file_load_options *load_options) {
+ const bool null_terminated = load_options ? load_options->null_terminated : false;
+
int fd = open(filepath, O_RDONLY);
if(fd == -1)
return -1;
@@ -20,7 +22,7 @@ int mgl_load_file(const char *filepath, mgl_filedata *filedata) {
return -1;
}
- unsigned char *data = malloc(st.st_size);
+ unsigned char *data = malloc(st.st_size + (null_terminated ? 1 : 0));
if(!data) {
close(fd);
return -1;
@@ -32,6 +34,9 @@ int mgl_load_file(const char *filepath, mgl_filedata *filedata) {
return -1;
}
+ if(null_terminated)
+ data[st.st_size] = '\0';
+
filedata->data = data;
filedata->size = st.st_size;