aboutsummaryrefslogtreecommitdiff
path: root/lib/tar/src/record_to_memory.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-02-08 14:08:34 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-02-08 14:08:34 +0100
commit92e2c77a5b5eeabc3252ea90953ab6bd1a8944d1 (patch)
treef1aed9639259b13f4fd9d5db6414cd914e7c8fa2 /lib/tar/src/record_to_memory.c
parentd8aba88445b3ca51f1e2b45d12688378d69745e9 (diff)
libtar: remove need for skip_padding function
In the istream implementation, automatically skip the padding when we reach end-of-file. Also skip file AND padding when we destroy the object. Replace the remaining instances with a simple istream_skip instead and remove the wrapper from libtar. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/tar/src/record_to_memory.c')
-rw-r--r--lib/tar/src/record_to_memory.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/tar/src/record_to_memory.c b/lib/tar/src/record_to_memory.c
index ba422de..43fd44c 100644
--- a/lib/tar/src/record_to_memory.c
+++ b/lib/tar/src/record_to_memory.c
@@ -27,8 +27,10 @@ char *record_to_memory(istream_t *fp, size_t size)
goto fail;
}
- if (skip_padding(fp, size))
- goto fail;
+ if (size % 512) {
+ if (istream_skip(fp, 512 - (size % 512)))
+ goto fail;
+ }
buffer[size] = '\0';
return buffer;