From ca9b6ba17257f88b8d575f18cab0b1e23660cfa5 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Mon, 19 Jun 2023 18:57:38 +0200
Subject: Move istream_get_line function to libutil

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 lib/io/src/get_line.c | 125 --------------------------------------------------
 lib/io/src/internal.h |   1 -
 2 files changed, 126 deletions(-)
 delete mode 100644 lib/io/src/get_line.c

(limited to 'lib/io/src')

diff --git a/lib/io/src/get_line.c b/lib/io/src/get_line.c
deleted file mode 100644
index 3178592..0000000
--- a/lib/io/src/get_line.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * get_line.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "internal.h"
-#include "sqfs/io.h"
-#include "sqfs/error.h"
-
-static void ltrim(char *buffer)
-{
-	size_t i = 0;
-
-	while (isspace(buffer[i]))
-		++i;
-
-	if (i > 0)
-		memmove(buffer, buffer + i, strlen(buffer + i) + 1);
-}
-
-static void rtrim(char *buffer)
-{
-	size_t i = strlen(buffer);
-
-	while (i > 0 && isspace(buffer[i - 1]))
-		--i;
-
-	buffer[i] = '\0';
-}
-
-static size_t trim(char *buffer, int flags)
-{
-	if (flags & ISTREAM_LINE_LTRIM)
-		ltrim(buffer);
-
-	if (flags & ISTREAM_LINE_RTRIM)
-		rtrim(buffer);
-
-	return strlen(buffer);
-}
-
-int istream_get_line(sqfs_istream_t *strm, char **out,
-		     size_t *line_num, int flags)
-{
-	char *line = NULL, *new;
-	size_t line_len = 0;
-	int err;
-
-	for (;;) {
-		bool have_line = false;
-		size_t i, count, avail;
-		const sqfs_u8 *ptr;
-
-		err = strm->get_buffered_data(strm, &ptr, &avail, 0);
-		if (err < 0)
-			goto fail;
-		if (err > 0) {
-			if (line_len == 0)
-				goto out_eof;
-
-			line_len = trim(line, flags);
-			if (line_len > 0 ||!(flags & ISTREAM_LINE_SKIP_EMPTY))
-				break;
-
-			goto out_eof;
-		}
-
-		for (i = 0; i < avail; ++i) {
-			if (ptr[i] == '\n')
-				break;
-		}
-
-		if (i < avail) {
-			count = i++;
-			have_line = true;
-		} else {
-			count = i;
-		}
-
-		new = realloc(line, line_len + count + 1);
-		if (new == NULL) {
-			err = SQFS_ERROR_ALLOC;
-			goto fail;
-		}
-
-		line = new;
-		memcpy(line + line_len, ptr, count);
-		line_len += count;
-		line[line_len] = '\0';
-
-		strm->advance_buffer(strm, i);
-
-		if (have_line) {
-			if (line_len > 0 && line[line_len - 1] == '\r')
-				line[--line_len] = '\0';
-
-			line_len = trim(line, flags);
-			if (line_len > 0 || !(flags & ISTREAM_LINE_SKIP_EMPTY))
-				break;
-
-			free(line);
-			line = NULL;
-			*line_num += 1;
-		}
-	}
-
-	new = realloc(line, line_len + 1);
-	if (new != NULL)
-		line = new;
-
-	*out = line;
-	return 0;
-fail: {
-	int temp = errno;
-	free(line);
-	*out = NULL;
-	errno = temp;
-	return err;
-}
-out_eof:
-	free(line);
-	*out = NULL;
-	return 1;
-}
diff --git a/lib/io/src/internal.h b/lib/io/src/internal.h
index a618ed3..e9804b9 100644
--- a/lib/io/src/internal.h
+++ b/lib/io/src/internal.h
@@ -9,7 +9,6 @@
 
 #include "config.h"
 #include "compat.h"
-#include "io/istream.h"
 #include "io/xfrm.h"
 #include "io/std.h"
 #include "xfrm/compress.h"
-- 
cgit v1.2.3