apio/minitar
1
1
Fork 0
Code Issues Pull Requests Releases 15 Activity

Reorganize minitar_attempt_read_entry

Browse Source
This commit is contained in:
apio 2022-11-22 17:28:34 +01:00
parent ba7b77bdae
commit b7c27a25a6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tar.c
View File

@ -37,19 +37,14 @@ static struct minitar_entry* minitar_attempt_read_entry(struct minitar* mp, int*
{ {
struct minitar_entry entry; struct minitar_entry entry;
struct tar_header hdr; struct tar_header hdr;
if (!minitar_read_header(mp, &hdr)) *valid = 1;
{ if (!minitar_read_header(mp, &hdr)) return NULL;
*valid = 1; // we are at end-of-file
return NULL;
}
if (!minitar_validate_header(&hdr)) if (!minitar_validate_header(&hdr))
{ {
*valid = 0; *valid = 0;
return NULL; return NULL;
} }
*valid = 0;
if (fgetpos(mp->stream, &entry.position)) return NULL; if (fgetpos(mp->stream, &entry.position)) return NULL;
*valid = 1;
minitar_parse_metadata_from_tar_header(&hdr, &entry.metadata); minitar_parse_metadata_from_tar_header(&hdr, &entry.metadata);
if (entry.metadata.size) if (entry.metadata.size)
{ {
@ -69,7 +64,7 @@ struct minitar_entry* minitar_read_entry(struct minitar* mp)
struct minitar_entry* result; struct minitar_entry* result;
do { do {
result = minitar_attempt_read_entry(mp, &valid); result = minitar_attempt_read_entry(mp, &valid);
} while (!valid); } while (!valid); // Skip over invalid entries
return result; return result;
} }