mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-22 03:02:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

(tar_decode_header): do not decode size here.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-07-18 14:43:37 +03:00
parent 78a25f7800
commit d647914bfb
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/vfs/tar/tar.c
View File

@ -674,11 +674,9 @@ tar_checksum (const union block *header)
/* --------------------------------------------------------------------------------------------- */
static size_t
static void
tar_decode_header (union block *header, tar_super_t * arch)
{
size_t size;
/*
* Try to determine the archive format.
*/
@ -711,19 +709,9 @@ tar_decode_header (union block *header, tar_super_t * arch)
header->header.typeflag = DIRTYPE;
}
/*
* Good block. Decode file size and return.
*/
if (header->header.typeflag == LNKTYPE || header->header.typeflag == DIRTYPE)
size = 0; /* Links 0 size on tape */
else
size = OFF_FROM_HEADER (header->header.size);
if (header->header.typeflag == GNUTYPE_DUMPDIR)
if (arch->type == TAR_UNKNOWN)
arch->type = TAR_GNU;
return size;
}
/* --------------------------------------------------------------------------------------------- */
@ -832,7 +820,12 @@ tar_read_header (struct vfs_class *me, struct vfs_s_super *archive, int tard, si
if (checksum_status != HEADER_SUCCESS)
return checksum_status;
*h_size = tar_decode_header (header, arch);
tar_decode_header (header, arch);
if (header->header.typeflag == LNKTYPE || header->header.typeflag == DIRTYPE)
*h_size = 0; /* Links 0 size on tape */
else
*h_size = OFF_FROM_HEADER (header->header.size);
/* Skip over pax extended header and global extended header records. */
if (header->header.typeflag == XHDTYPE || header->header.typeflag == XGLTYPE)