From d9b8f7bda83e746617ce1001972ba255ffdebed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Tue, 22 May 2018 16:25:23 +0200 Subject: text: allow to specify how the file content should be loaded --- text.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'text.c') diff --git a/text.c b/text.c index 5d5f814..548805b 100644 --- a/text.c +++ b/text.c @@ -1120,9 +1120,11 @@ ssize_t text_write_range(Text *txt, Filerange *range, int fd) { return size - rem; } -/* load the given file as starting point for further editing operations. - * to start with an empty document, pass NULL as filename. */ Text *text_load(const char *filename) { + return text_load_method(filename, TEXT_LOAD_AUTO); +} + +Text *text_load_method(const char *filename, enum TextLoadMethod method) { int fd = -1; size_t size = 0; Text *txt = calloc(1, sizeof *txt); @@ -1144,7 +1146,7 @@ Text *text_load(const char *filename) { // XXX: use lseek(fd, 0, SEEK_END); instead? size = txt->info.st_size; if (size > 0) { - if (size < BLOCK_MMAP_SIZE) + if (method == TEXT_LOAD_READ || (method == TEXT_LOAD_AUTO && size < BLOCK_MMAP_SIZE)) txt->block = block_read(txt, size, fd); else txt->block = block_mmap(txt, size, fd, 0); -- cgit v1.2.3