aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-04-30 20:24:42 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-05-02 12:40:06 +0200
commit76267654ebd43c1dfa28aa290b0d320df9781b2d (patch)
treefe6d0d056f2a21438aba5e0a26e55dfbf0d4ebf4 /lib
parentea1cb44cc85e70fdeb8514fc909c54af72b1bfe9 (diff)
Move abstract squashfs I/O code to libsquashfs.a
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makemodule.am5
-rw-r--r--lib/sqfs/meta_writer.c93
2 files changed, 97 insertions, 1 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 67804d8..c969eff 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -6,6 +6,9 @@ libcompress_a_SOURCES = lib/comp/compressor.c lib/comp/internal.h
libcompress_a_CFLAGS = $(AM_CFLAGS)
libcompress_a_CPPFLAGS = $(AM_CPPFLAGS)
+libsquashfs_a_SOURCES = include/meta_writer.h include/squashfs.h
+libsquashfs_a_SOURCES += lib/sqfs/meta_writer.c
+
libutil_a_SOURCES = lib/util/canonicalize_name.c lib/util/write_retry.c
libutil_a_SOURCES += lib/util/read_retry.c include/util.h
@@ -23,4 +26,4 @@ libcompress_a_CFLAGS += $(XZ_CFLAGS)
libcompress_a_CPPFLAGS += -DWITH_LZMA
endif
-noinst_LIBRARIES += libfstree.a libcompress.a libutil.a
+noinst_LIBRARIES += libfstree.a libcompress.a libutil.a libsquashfs.a
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
new file mode 100644
index 0000000..95092d5
--- /dev/null
+++ b/lib/sqfs/meta_writer.c
@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+#include "meta_writer.h"
+#include "squashfs.h"
+#include "util.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+
+meta_writer_t *meta_writer_create(int fd, compressor_t *cmp)
+{
+ meta_writer_t *m = calloc(1, sizeof(*m));
+
+ if (m == NULL) {
+ perror("creating meta data writer");
+ return NULL;
+ }
+
+ m->cmp = cmp;
+ m->outfd = fd;
+ return m;
+}
+
+void meta_writer_destroy(meta_writer_t *m)
+{
+ free(m);
+}
+
+int meta_writer_flush(meta_writer_t *m)
+{
+ ssize_t ret, count;
+
+ if (m->offset == 0)
+ return 0;
+
+ ret = m->cmp->do_block(m->cmp, m->data + 2, m->offset);
+ if (ret < 0)
+ return -1;
+
+ if (ret > 0) {
+ ((uint16_t *)m->data)[0] = htole16(ret);
+ count = ret + 2;
+ } else {
+ ((uint16_t *)m->data)[0] = htole16(m->offset | 0x8000);
+ count = m->offset + 2;
+ }
+
+ ret = write_retry(m->outfd, m->data, count);
+
+ if (ret < 0) {
+ perror("writing meta data");
+ return -1;
+ }
+
+ if (ret < count) {
+ fputs("meta data written to file was truncated\n", stderr);
+ return -1;
+ }
+
+ memset(m->data, 0, sizeof(m->data));
+ m->offset = 0;
+ m->block_offset += count;
+ return 0;
+}
+
+int meta_writer_append(meta_writer_t *m, const void *data, size_t size)
+{
+ size_t diff;
+
+ while (size != 0) {
+ diff = sizeof(m->data) - 2 - m->offset;
+
+ if (diff == 0) {
+ if (meta_writer_flush(m))
+ return -1;
+ diff = sizeof(m->data) - 2;
+ }
+
+ if (diff > size)
+ diff = size;
+
+ memcpy(m->data + 2 + m->offset, data, diff);
+ m->offset += diff;
+ size -= diff;
+ data = (const char *)data + diff;
+ }
+
+ if (m->offset == (sizeof(m->data) - 2))
+ return meta_writer_flush(m);
+
+ return 0;
+}