aboutsummaryrefslogtreecommitdiff
path: root/lib/tar
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tar')
-rw-r--r--lib/tar/src/internal.h10
-rw-r--r--lib/tar/src/iterator.c22
-rw-r--r--lib/tar/src/padd_file.c2
-rw-r--r--lib/tar/src/pax_header.c4
-rw-r--r--lib/tar/src/read_header.c2
-rw-r--r--lib/tar/src/read_sparse_map_new.c2
-rw-r--r--lib/tar/src/read_sparse_map_old.c2
-rw-r--r--lib/tar/src/record_to_memory.c2
-rw-r--r--lib/tar/src/write_header.c13
-rw-r--r--lib/tar/test/tar_big_file.c2
-rw-r--r--lib/tar/test/tar_fuzz.c2
-rw-r--r--lib/tar/test/tar_iterator.c2
-rw-r--r--lib/tar/test/tar_iterator2.c2
-rw-r--r--lib/tar/test/tar_iterator3.c2
-rw-r--r--lib/tar/test/tar_simple.c2
-rw-r--r--lib/tar/test/tar_sparse.c2
-rw-r--r--lib/tar/test/tar_sparse_gnu.c2
-rw-r--r--lib/tar/test/tar_target_filled.c2
-rw-r--r--lib/tar/test/tar_write_simple.c12
-rw-r--r--lib/tar/test/tar_xattr.c2
-rw-r--r--lib/tar/test/tar_xattr_bin.c2
21 files changed, 48 insertions, 45 deletions
diff --git a/lib/tar/src/internal.h b/lib/tar/src/internal.h
index c5483fe..56613d3 100644
--- a/lib/tar/src/internal.h
+++ b/lib/tar/src/internal.h
@@ -34,13 +34,15 @@ enum {
ETV_POSIX,
};
-sparse_map_t *read_gnu_old_sparse(istream_t *fp, tar_header_t *hdr);
+sparse_map_t *read_gnu_old_sparse(sqfs_istream_t *fp, tar_header_t *hdr);
-sparse_map_t *read_gnu_new_sparse(istream_t *fp, tar_header_decoded_t *out);
+sparse_map_t *read_gnu_new_sparse(sqfs_istream_t *fp,
+ tar_header_decoded_t *out);
-char *record_to_memory(istream_t *fp, size_t size);
+char *record_to_memory(sqfs_istream_t *fp, size_t size);
-int read_pax_header(istream_t *fp, sqfs_u64 entsize, unsigned int *set_by_pax,
+int read_pax_header(sqfs_istream_t *fp, sqfs_u64 entsize,
+ unsigned int *set_by_pax,
tar_header_decoded_t *out);
#endif /* INTERNAL_H */
diff --git a/lib/tar/src/iterator.c b/lib/tar/src/iterator.c
index 1f26e76..5920b46 100644
--- a/lib/tar/src/iterator.c
+++ b/lib/tar/src/iterator.c
@@ -20,7 +20,7 @@
typedef struct {
dir_iterator_t base;
tar_header_decoded_t current;
- istream_t *stream;
+ sqfs_istream_t *stream;
int state;
/* File I/O wrapper related */
@@ -35,7 +35,7 @@ typedef struct {
} tar_iterator_t;
typedef struct {
- istream_t base;
+ sqfs_istream_t base;
tar_iterator_t *parent;
int state;
@@ -89,12 +89,12 @@ static void drop_parent(tar_istream_t *tar, int state)
tar->state = state;
}
-static const char *strm_get_filename(istream_t *strm)
+static const char *strm_get_filename(sqfs_istream_t *strm)
{
return ((tar_istream_t *)strm)->parent->current.name;
}
-static int strm_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
+static int strm_get_buffered_data(sqfs_istream_t *strm, const sqfs_u8 **out,
size_t *size, size_t want)
{
tar_istream_t *tar = (tar_istream_t *)strm;
@@ -142,7 +142,7 @@ out_eof:
return 1;
}
-static void strm_advance_buffer(istream_t *strm, size_t count)
+static void strm_advance_buffer(sqfs_istream_t *strm, size_t count)
{
tar_istream_t *tar = (tar_istream_t *)strm;
@@ -263,7 +263,7 @@ static void it_ignore_subdir(dir_iterator_t *it)
/* TODO: skip list */
}
-static int it_open_file_ro(dir_iterator_t *it, istream_t **out)
+static int it_open_file_ro(dir_iterator_t *it, sqfs_istream_t **out)
{
tar_iterator_t *tar = (tar_iterator_t *)it;
tar_istream_t *strm;
@@ -285,12 +285,12 @@ static int it_open_file_ro(dir_iterator_t *it, istream_t **out)
sqfs_object_init(strm, strm_destroy, NULL);
strm->parent = sqfs_grab(tar);
- ((istream_t *)strm)->get_buffered_data = strm_get_buffered_data;
- ((istream_t *)strm)->advance_buffer = strm_advance_buffer;
- ((istream_t *)strm)->get_filename = strm_get_filename;
+ ((sqfs_istream_t *)strm)->get_buffered_data = strm_get_buffered_data;
+ ((sqfs_istream_t *)strm)->advance_buffer = strm_advance_buffer;
+ ((sqfs_istream_t *)strm)->get_filename = strm_get_filename;
tar->locked = true;
- *out = (istream_t *)strm;
+ *out = (sqfs_istream_t *)strm;
return 0;
}
@@ -351,7 +351,7 @@ static int tar_probe(const sqfs_u8 *data, size_t size)
return 0;
}
-dir_iterator_t *tar_open_stream(istream_t *strm)
+dir_iterator_t *tar_open_stream(sqfs_istream_t *strm)
{
tar_iterator_t *tar = calloc(1, sizeof(*tar));
dir_iterator_t *it = (dir_iterator_t *)tar;
diff --git a/lib/tar/src/padd_file.c b/lib/tar/src/padd_file.c
index 0f6ee0a..814b666 100644
--- a/lib/tar/src/padd_file.c
+++ b/lib/tar/src/padd_file.c
@@ -8,7 +8,7 @@
#include "tar/tar.h"
#include "tar/format.h"
-int padd_file(ostream_t *fp, sqfs_u64 size)
+int padd_file(sqfs_ostream_t *fp, sqfs_u64 size)
{
size_t padd_sz = size % TAR_RECORD_SIZE;
diff --git a/lib/tar/src/pax_header.c b/lib/tar/src/pax_header.c
index 74a1b24..5ed9c4b 100644
--- a/lib/tar/src/pax_header.c
+++ b/lib/tar/src/pax_header.c
@@ -293,8 +293,8 @@ static int apply_handler(tar_header_decoded_t *out,
return 0;
}
-int read_pax_header(istream_t *fp, sqfs_u64 entsize, unsigned int *set_by_pax,
- tar_header_decoded_t *out)
+int read_pax_header(sqfs_istream_t *fp, sqfs_u64 entsize,
+ unsigned int *set_by_pax, tar_header_decoded_t *out)
{
char *buffer, *line, *key, *ptr, *value, *end;
sparse_map_t *sparse_last = NULL, *sparse;
diff --git a/lib/tar/src/read_header.c b/lib/tar/src/read_header.c
index 751c5dc..3117d8a 100644
--- a/lib/tar/src/read_header.c
+++ b/lib/tar/src/read_header.c
@@ -164,7 +164,7 @@ static int decode_header(const tar_header_t *hdr, unsigned int set_by_pax,
return 0;
}
-int read_header(istream_t *fp, tar_header_decoded_t *out)
+int read_header(sqfs_istream_t *fp, tar_header_decoded_t *out)
{
unsigned int set_by_pax = 0;
bool prev_was_zero = false;
diff --git a/lib/tar/src/read_sparse_map_new.c b/lib/tar/src/read_sparse_map_new.c
index de1b6a4..a1f37fd 100644
--- a/lib/tar/src/read_sparse_map_new.c
+++ b/lib/tar/src/read_sparse_map_new.c
@@ -31,7 +31,7 @@ static int decode(const char *str, size_t len, size_t *out)
return (*str == '\n') ? ((int)count + 1) : -1;
}
-sparse_map_t *read_gnu_new_sparse(istream_t *fp, tar_header_decoded_t *out)
+sparse_map_t *read_gnu_new_sparse(sqfs_istream_t *fp, tar_header_decoded_t *out)
{
sparse_map_t *last = NULL, *list = NULL, *ent = NULL;
size_t i, count, value;
diff --git a/lib/tar/src/read_sparse_map_old.c b/lib/tar/src/read_sparse_map_old.c
index 8f193d4..832329b 100644
--- a/lib/tar/src/read_sparse_map_old.c
+++ b/lib/tar/src/read_sparse_map_old.c
@@ -45,7 +45,7 @@ static int parse(const gnu_old_sparse_t *in, size_t count,
return 0;
}
-sparse_map_t *read_gnu_old_sparse(istream_t *fp, tar_header_t *hdr)
+sparse_map_t *read_gnu_old_sparse(sqfs_istream_t *fp, tar_header_t *hdr)
{
sparse_map_t *list = NULL, *end = NULL;
gnu_old_sparse_record_t sph;
diff --git a/lib/tar/src/record_to_memory.c b/lib/tar/src/record_to_memory.c
index 43fd44c..1bd31aa 100644
--- a/lib/tar/src/record_to_memory.c
+++ b/lib/tar/src/record_to_memory.c
@@ -10,7 +10,7 @@
#include "internal.h"
#include <stdlib.h>
-char *record_to_memory(istream_t *fp, size_t size)
+char *record_to_memory(sqfs_istream_t *fp, size_t size)
{
char *buffer = malloc(size + 1);
int ret;
diff --git a/lib/tar/src/write_header.c b/lib/tar/src/write_header.c
index 726b15d..1183c9a 100644
--- a/lib/tar/src/write_header.c
+++ b/lib/tar/src/write_header.c
@@ -63,8 +63,8 @@ static void write_number_signed(char *dst, sqfs_s64 value, int digits)
}
}
-static int write_header(ostream_t *fp, const struct stat *sb, const char *name,
- const char *slink_target, int type)
+static int write_header(sqfs_ostream_t *fp, const struct stat *sb,
+ const char *name, const char *slink_target, int type)
{
int maj = 0, min = 0;
sqfs_u64 size = 0;
@@ -101,7 +101,7 @@ static int write_header(ostream_t *fp, const struct stat *sb, const char *name,
return fp->append(fp, &hdr, sizeof(hdr));
}
-static int write_ext_header(ostream_t *fp, const struct stat *orig,
+static int write_ext_header(sqfs_ostream_t *fp, const struct stat *orig,
const char *payload, size_t payload_len,
int type, const char *name)
{
@@ -144,7 +144,7 @@ static size_t prefix_digit_len(size_t len)
return ndigit;
}
-static int write_schily_xattr(ostream_t *fp, const struct stat *orig,
+static int write_schily_xattr(sqfs_ostream_t *fp, const struct stat *orig,
const char *name, const sqfs_xattr_t *xattr)
{
static const char *prefix = "SCHILY.xattr.";
@@ -183,7 +183,8 @@ static int write_schily_xattr(ostream_t *fp, const struct stat *orig,
return ret;
}
-int write_tar_header(ostream_t *fp, const struct stat *sb, const char *name,
+int write_tar_header(sqfs_ostream_t *fp,
+ const struct stat *sb, const char *name,
const char *slink_target, const sqfs_xattr_t *xattr,
unsigned int counter)
{
@@ -242,7 +243,7 @@ out_skip:
return 1;
}
-int write_hard_link(ostream_t *fp, const struct stat *sb, const char *name,
+int write_hard_link(sqfs_ostream_t *fp, const struct stat *sb, const char *name,
const char *target, unsigned int counter)
{
tar_header_t hdr;
diff --git a/lib/tar/test/tar_big_file.c b/lib/tar/test/tar_big_file.c
index deb41f4..444548b 100644
--- a/lib/tar/test/tar_big_file.c
+++ b/lib/tar/test/tar_big_file.c
@@ -12,7 +12,7 @@
int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
- istream_t *fp;
+ sqfs_istream_t *fp;
(void)argc; (void)argv;
fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
diff --git a/lib/tar/test/tar_fuzz.c b/lib/tar/test/tar_fuzz.c
index 21e6978..bdea98e 100644
--- a/lib/tar/test/tar_fuzz.c
+++ b/lib/tar/test/tar_fuzz.c
@@ -15,7 +15,7 @@
int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
- istream_t *fp;
+ sqfs_istream_t *fp;
int ret;
if (argc != 2) {
diff --git a/lib/tar/test/tar_iterator.c b/lib/tar/test/tar_iterator.c
index 21bd3e6..25e1389 100644
--- a/lib/tar/test/tar_iterator.c
+++ b/lib/tar/test/tar_iterator.c
@@ -30,7 +30,7 @@ static const char *fname = STRVALUE(TESTFNAME);
int main(int argc, char **argv)
{
- istream_t *fp, *ti, *ti2;
+ sqfs_istream_t *fp, *ti, *ti2;
dir_iterator_t *it;
dir_entry_t *ent;
char buffer[100];
diff --git a/lib/tar/test/tar_iterator2.c b/lib/tar/test/tar_iterator2.c
index 7f1f3bf..6f472ae 100644
--- a/lib/tar/test/tar_iterator2.c
+++ b/lib/tar/test/tar_iterator2.c
@@ -44,8 +44,8 @@ static int byte_from_offset(uint64_t offset)
int main(int argc, char **argv)
{
unsigned char buffer[941];
+ sqfs_istream_t *fp, *ti;
dir_iterator_t *it;
- istream_t *fp, *ti;
dir_entry_t *ent;
uint64_t offset;
sqfs_s32 i, ret;
diff --git a/lib/tar/test/tar_iterator3.c b/lib/tar/test/tar_iterator3.c
index b2ad6f9..39e7b42 100644
--- a/lib/tar/test/tar_iterator3.c
+++ b/lib/tar/test/tar_iterator3.c
@@ -13,8 +13,8 @@
int main(int argc, char **argv)
{
+ sqfs_istream_t *fp, *ti;
dir_iterator_t *it;
- istream_t *fp, *ti;
char buffer[100];
dir_entry_t *ent;
char *link;
diff --git a/lib/tar/test/tar_simple.c b/lib/tar/test/tar_simple.c
index cb38abb..656e59b 100644
--- a/lib/tar/test/tar_simple.c
+++ b/lib/tar/test/tar_simple.c
@@ -37,9 +37,9 @@ static const char *fname = STRVALUE(TESTFNAME);
int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
+ sqfs_istream_t *fp;
char buffer[6];
sqfs_s64 ts;
- istream_t *fp;
(void)argc; (void)argv;
fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
diff --git a/lib/tar/test/tar_sparse.c b/lib/tar/test/tar_sparse.c
index 27ce053..99d4639 100644
--- a/lib/tar/test/tar_sparse.c
+++ b/lib/tar/test/tar_sparse.c
@@ -13,7 +13,7 @@ static void test_case_sparse(const char *path)
{
tar_header_decoded_t hdr;
sparse_map_t *sparse;
- istream_t *fp;
+ sqfs_istream_t *fp;
fp = istream_open_file(path);
TEST_NOT_NULL(fp);
diff --git a/lib/tar/test/tar_sparse_gnu.c b/lib/tar/test/tar_sparse_gnu.c
index 19ddd0a..675ef9a 100644
--- a/lib/tar/test/tar_sparse_gnu.c
+++ b/lib/tar/test/tar_sparse_gnu.c
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
sparse_map_t *sparse;
- istream_t *fp;
+ sqfs_istream_t *fp;
(void)argc; (void)argv;
TEST_ASSERT(chdir(TEST_PATH) == 0);
diff --git a/lib/tar/test/tar_target_filled.c b/lib/tar/test/tar_target_filled.c
index e2e1798..815728a 100644
--- a/lib/tar/test/tar_target_filled.c
+++ b/lib/tar/test/tar_target_filled.c
@@ -12,8 +12,8 @@
int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
+ sqfs_istream_t *fp;
char buffer[16];
- istream_t *fp;
(void)argc; (void)argv;
TEST_ASSERT(chdir(TEST_PATH) == 0);
diff --git a/lib/tar/test/tar_write_simple.c b/lib/tar/test/tar_write_simple.c
index b34c9c5..98ac25b 100644
--- a/lib/tar/test/tar_write_simple.c
+++ b/lib/tar/test/tar_write_simple.c
@@ -14,10 +14,10 @@
/*****************************************************************************/
-static int buffer_append(ostream_t *strm, const void *data, size_t size);
-static const char *buffer_get_filename(ostream_t *strm);
+static int buffer_append(sqfs_ostream_t *strm, const void *data, size_t size);
+static const char *buffer_get_filename(sqfs_ostream_t *strm);
-static ostream_t mem_stream = {
+static sqfs_ostream_t mem_stream = {
{ 1, NULL, NULL },
buffer_append,
NULL,
@@ -29,7 +29,7 @@ static size_t wr_offset = 0;
static sqfs_u8 rd_buffer[1024 * 10];
-static int buffer_append(ostream_t *strm, const void *data, size_t size)
+static int buffer_append(sqfs_ostream_t *strm, const void *data, size_t size)
{
TEST_ASSERT(strm == &mem_stream);
TEST_ASSERT(wr_offset < sizeof(wr_buffer));
@@ -46,7 +46,7 @@ static int buffer_append(ostream_t *strm, const void *data, size_t size)
return 0;
}
-static const char *buffer_get_filename(ostream_t *strm)
+static const char *buffer_get_filename(sqfs_ostream_t *strm)
{
TEST_ASSERT(strm == &mem_stream);
return "dummy";
@@ -79,8 +79,8 @@ static sqfs_xattr_t *mkxattr_chain(void)
int main(int argc, char **argv)
{
sqfs_xattr_t *xattr;
+ sqfs_istream_t *fp;
struct stat sb;
- istream_t *fp;
int ret;
(void)argc; (void)argv;
diff --git a/lib/tar/test/tar_xattr.c b/lib/tar/test/tar_xattr.c
index 1577fc7..657b73d 100644
--- a/lib/tar/test/tar_xattr.c
+++ b/lib/tar/test/tar_xattr.c
@@ -13,8 +13,8 @@
int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
+ sqfs_istream_t *fp;
char buffer[6];
- istream_t *fp;
(void)argc; (void)argv;
fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
diff --git a/lib/tar/test/tar_xattr_bin.c b/lib/tar/test/tar_xattr_bin.c
index 129d227..f897bce 100644
--- a/lib/tar/test/tar_xattr_bin.c
+++ b/lib/tar/test/tar_xattr_bin.c
@@ -21,8 +21,8 @@ static const uint8_t value[] = {
int main(int argc, char **argv)
{
tar_header_decoded_t hdr;
+ sqfs_istream_t *fp;
char buffer[6];
- istream_t *fp;
(void)argc; (void)argv;
fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 22:29:34 +0000