diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-20 17:04:15 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-22 16:15:45 +0200 |
| commit | 6351872732fce77186f401050eee92c7c3aa3461 (patch) | |
| tree | c938233378d13dbc94e08f24e34bb84406b08d21 /lib/tar/src/read_header.c | |
| parent | 9a97a9a4fe224bcf53ad23af31bca67bbb71a824 (diff) | |
libtar: add a dir_iterator_t implementation for tar files
The existing istream_t wrapper is mered into this one as well, we
can open the files via the iterators open_file_ro function. Unit
tests and tar2sqfs are modified accordingly.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/tar/src/read_header.c')
| -rw-r--r-- | lib/tar/src/read_header.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/tar/src/read_header.c b/lib/tar/src/read_header.c index 8d3145b..751c5dc 100644 --- a/lib/tar/src/read_header.c +++ b/lib/tar/src/read_header.c @@ -224,7 +224,9 @@ int read_header(istream_t *fp, tar_header_decoded_t *out) case TAR_TYPE_PAX_GLOBAL: if (read_number(hdr.size, sizeof(hdr.size), &pax_size)) goto fail; - skip_entry(fp, pax_size); + if (pax_size % 512) + pax_size += 512 - (pax_size % 512); + istream_skip(fp, pax_size); continue; case TAR_TYPE_PAX: clear_header(out); @@ -291,10 +293,3 @@ fail: clear_header(out); return -1; } - -int skip_entry(istream_t *fp, sqfs_u64 size) -{ - size_t tail = size % 512; - - return istream_skip(fp, tail ? (size + 512 - tail) : size); -} |