From 4ae70721aae5f974538928cadc71fa3269e5ad20 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 7 Oct 2022 23:18:06 +0200 Subject: fs: use `getline()` for line wise read operations Use `getline()` instead of a custom `fgets()` wrapper logic to perform line wise reads from open file handles. This is required to properly deal with lines containing embedded null bytes. Signed-off-by: Jo-Philipp Wich --- lib/fs.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'lib/fs.c') diff --git a/lib/fs.c b/lib/fs.c index e0e5179..f5951db 100644 --- a/lib/fs.c +++ b/lib/fs.c @@ -64,6 +64,7 @@ uc_fs_read_common(uc_vm_t *vm, size_t nargs, const char *type) size_t rlen, len = 0; const char *lstr; int64_t lsize; + ssize_t llen; FILE **fp = uc_fn_this(type); @@ -74,26 +75,12 @@ uc_fs_read_common(uc_vm_t *vm, size_t nargs, const char *type) lstr = ucv_string_get(limit); if (!strcmp(lstr, "line")) { - while (true) { - if (!fgets(buf, sizeof(buf), *fp)) - break; + llen = getline(&p, &rlen, *fp); - rlen = strlen(buf); - tmp = realloc(p, len + rlen + 1); - - if (!tmp) { - free(p); - err_return(ENOMEM); - } + if (llen == -1) + err_return(errno); - snprintf(tmp + len, rlen + 1, "%s", buf); - - p = tmp; - len += rlen; - - if (rlen > 0 && buf[rlen - 1] == '\n') - break; - } + len = (size_t)llen; } else if (!strcmp(lstr, "all")) { while (true) { -- cgit v1.2.3