aboutsummaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/file.c6
-rw-r--r--src/common/file.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/common/file.c b/src/common/file.c
index 70a5631..47c97af 100644
--- a/src/common/file.c
+++ b/src/common/file.c
@@ -19,7 +19,7 @@
char*
-bc_file_get_contents(const char *path, size_t *len, bc_error_t **err)
+bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t **err)
{
if (path == NULL || err == NULL || *err != NULL)
return NULL;
@@ -43,7 +43,7 @@ bc_file_get_contents(const char *path, size_t *len, bc_error_t **err)
tmp = buffer;
- if (str->len == 0 && read_len > 0) {
+ if (utf8 && str->len == 0 && read_len > 0) {
// skipping BOM before validation, for performance. should be safe
// enough
size_t skip = bc_utf8_skip_bom((uint8_t*) buffer, read_len);
@@ -56,7 +56,7 @@ bc_file_get_contents(const char *path, size_t *len, bc_error_t **err)
}
fclose(fp);
- if (!bc_utf8_validate_str(str)) {
+ if (utf8 && !bc_utf8_validate_str(str)) {
*err = bc_error_new_printf(BC_ERROR_FILE,
"File content is not valid UTF-8: %s", path);
bc_string_free(str, true);
diff --git a/src/common/file.h b/src/common/file.h
index e095de7..498f4f4 100644
--- a/src/common/file.h
+++ b/src/common/file.h
@@ -10,10 +10,11 @@
#define _FILE_H
#include <stddef.h>
+#include <stdbool.h>
#include "error.h"
#define BC_FILE_CHUNK_SIZE 1024
-char* bc_file_get_contents(const char *path, size_t *len, bc_error_t **err);
+char* bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t **err);
#endif /* _FILE_H */