From 6e7b20a41c8a7f10392884e1741b031b579a93fa Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 23 Sep 2023 10:37:27 +0200 Subject: Cleanup: move memory/stdio streams to libcommon Signed-off-by: David Oberhollenzer --- lib/io/src/internal.h | 1 - lib/io/src/mem.c | 110 -------------------------------------------------- lib/io/src/std.c | 35 ---------------- 3 files changed, 146 deletions(-) delete mode 100644 lib/io/src/mem.c delete mode 100644 lib/io/src/std.c (limited to 'lib/io/src') diff --git a/lib/io/src/internal.h b/lib/io/src/internal.h index e9804b9..7c2b1df 100644 --- a/lib/io/src/internal.h +++ b/lib/io/src/internal.h @@ -10,7 +10,6 @@ #include "config.h" #include "compat.h" #include "io/xfrm.h" -#include "io/std.h" #include "xfrm/compress.h" #include diff --git a/lib/io/src/mem.c b/lib/io/src/mem.c deleted file mode 100644 index 7150d1f..0000000 --- a/lib/io/src/mem.c +++ /dev/null @@ -1,110 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * mem.c - * - * Copyright (C) 2023 David Oberhollenzer - */ -#include "config.h" -#include "io/mem.h" -#include "compat.h" -#include "sqfs/io.h" - -#include -#include -#include - -typedef struct { - sqfs_istream_t base; - - sqfs_u8 *buffer; - size_t bufsz; - - const void *data; - size_t size; - size_t offset; - size_t visible; - - char *name; -} mem_istream_t; - -static int mem_get_buffered_data(sqfs_istream_t *strm, const sqfs_u8 **out, - size_t *size, size_t want) -{ - mem_istream_t *mem = (mem_istream_t *)strm; - size_t have = mem->size - mem->offset; - - if (have > mem->bufsz) - have = mem->bufsz; - - if (want > have) - want = have; - - if (mem->visible == 0 || mem->visible < want) { - memcpy(mem->buffer + mem->visible, - (const char *)mem->data + mem->offset + mem->visible, - have - mem->visible); - mem->visible = have; - } - - *out = mem->buffer; - *size = mem->visible; - return (mem->visible == 0) ? 1 : 0; -} - -static void mem_advance_buffer(sqfs_istream_t *strm, size_t count) -{ - mem_istream_t *mem = (mem_istream_t *)strm; - - assert(count <= mem->visible); - - if (count > 0 && count < mem->visible) - memmove(mem->buffer, mem->buffer + count, mem->visible - count); - - mem->offset += count; - mem->visible -= count; - - if (mem->visible < mem->bufsz) { - memset(mem->buffer + mem->visible, 0, - mem->bufsz - mem->visible); - } -} - -static const char *mem_in_get_filename(sqfs_istream_t *strm) -{ - return ((mem_istream_t *)strm)->name; -} - -static void mem_in_destroy(sqfs_object_t *obj) -{ - free(((mem_istream_t *)obj)->buffer); - free(((mem_istream_t *)obj)->name); - free(obj); -} - -sqfs_istream_t *istream_memory_create(const char *name, size_t bufsz, - const void *data, size_t size) -{ - mem_istream_t *mem = calloc(1, sizeof(*mem)); - sqfs_istream_t *strm = (sqfs_istream_t *)mem; - - if (mem == NULL) - return NULL; - - sqfs_object_init(mem, mem_in_destroy, NULL); - - mem->name = strdup(name); - if (mem->name == NULL) - return sqfs_drop(mem); - - mem->buffer = malloc(bufsz); - if (mem->buffer == NULL) - return sqfs_drop(mem); - - mem->data = data; - mem->size = size; - mem->bufsz = bufsz; - strm->get_buffered_data = mem_get_buffered_data; - strm->advance_buffer = mem_advance_buffer; - strm->get_filename = mem_in_get_filename; - return strm; -} diff --git a/lib/io/src/std.c b/lib/io/src/std.c deleted file mode 100644 index 62635ec..0000000 --- a/lib/io/src/std.c +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * std.c - * - * Copyright (C) 2023 David Oberhollenzer - */ -#include "config.h" -#include "compat.h" -#include "io/std.h" -#include "sqfs/io.h" - -#if defined(_WIN32) || defined(__WINDOWS__) -#define WIN32_LEAN_AND_MEAN -#include -#else -#include -#define STD_INPUT_HANDLE STDIN_FILENO -#define STD_OUTPUT_HANDLE STDOUT_FILENO -#define GetStdHandle(hnd) hnd -#endif - -int istream_open_stdin(sqfs_istream_t **out) -{ - sqfs_file_handle_t hnd = GetStdHandle(STD_INPUT_HANDLE); - - return sqfs_istream_open_handle(out, "stdin", hnd, 0); -} - -int ostream_open_stdout(sqfs_ostream_t **out) -{ - sqfs_file_handle_t hnd = GetStdHandle(STD_OUTPUT_HANDLE); - - return sqfs_ostream_open_handle(out, "stdout", hnd, - SQFS_FILE_OPEN_NO_SPARSE); -} -- cgit v1.2.3