}
set_next_block_after (current_header);
+
+ if (!ignore_zeros_option)
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+
+ status = read_header (false);
+ if (status == HEADER_ZERO_BLOCK)
+ break;
+ WARN ((0, 0, _("A lone zero block at %s"),
+ STRINGIFY_BIGINT (current_block_ordinal (), buf)));
+ }
status = prev_status;
- if (ignore_zeros_option)
- continue;
- break;
+ continue;
case HEADER_END_OF_FILE:
if (block_number_option)
*bp = '\0';
}
- else if (header->header.typeflag == XHDTYPE
- || header->header.typeflag == XGLTYPE)
+ else if (header->header.typeflag == XHDTYPE)
xheader_read (header, OFF_FROM_HEADER (header->header.size));
+ else if (header->header.typeflag == XGLTYPE)
+ {
+ xheader_read (header, OFF_FROM_HEADER (header->header.size));
+ xheader_decode_global ();
+ }
/* Loop! */
&& ISOCTAL (header->star_header.ctime[0])
&& header->star_header.ctime[11] == ' ')
format = STAR_FORMAT;
- else
+ else if (extended_header.size)
format = POSIX_FORMAT;
+ else
+ format = USTAR_FORMAT;
}
else if (strcmp (header->header.magic, OLDGNU_MAGIC) == 0)
format = OLDGNU_FORMAT;
}
}
- if (extended_header.size)
- xheader_decode (stat_info);
+ current_stat_info.archive_file_size = current_stat_info.stat.st_size;
+ xheader_decode (stat_info);
}
/* Convert buffer at WHERE0 of size DIGS from external format to
uintbuf));
break;
default:
- strcpy (size, STRINGIFY_BIGINT (st->stat.st_size, uintbuf));
+ /* st->stat.st_size keeps stored file size */
+ strcpy (size, STRINGIFY_BIGINT (st->archive_file_size, uintbuf));
break;
}