59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Define to non-zero for forcing old ctime format instead of ISO format. */
-#undef USE_OLD_CTIME
+#undef USE_OLD_CTIME
#include "system.h"
#include <quotearg.h>
}
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)));
+ break;
+ }
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! */
{
case BLKTYPE:
case CHRTYPE:
- stat_info->stat.st_rdev = makedev (stat_info->devmajor, stat_info->devminor);
+ stat_info->stat.st_rdev = makedev (stat_info->devmajor,
+ stat_info->devminor);
break;
default:
}
}
- current_stat_info.archive_file_size = current_stat_info.stat.st_size;
- if (extended_header.size)
- xheader_decode (stat_info);
+ stat_info->archive_file_size = stat_info->stat.st_size;
+ xheader_decode (stat_info);
+
+ if (sparse_member_p (stat_info))
+ {
+ sparse_fixup_header (stat_info);
+ stat_info->is_sparse = true;
+ }
}
/* Convert buffer at WHERE0 of size DIGS from external format to
#else
/* Use ISO 8610 format. See:
http://www.cl.cam.ac.uk/~mgk25/iso-time.html */
- struct tm *tm = localtime (&t);
+ struct tm *tm = utc_option ? gmtime (&t) : localtime (&t);
if (tm)
{
sprintf (buffer, "%04ld-%02d-%02d %02d:%02d:%02d",
strcat (size,
STRINGIFY_BIGINT (minor (st->stat.st_rdev), uintbuf));
break;
- case GNUTYPE_SPARSE:
- strcpy (size,
- STRINGIFY_BIGINT
- (UINTMAX_FROM_HEADER (current_header
- ->oldgnu_header.realsize),
- uintbuf));
- break;
+
default:
/* st->stat.st_size keeps stored file size */
- strcpy (size, STRINGIFY_BIGINT (st->archive_file_size, uintbuf));
+ strcpy (size, STRINGIFY_BIGINT (st->stat.st_size, uintbuf));
break;
}
char save_typeflag = current_header->header.typeflag;
set_next_block_after (current_header);
- if (current_format == OLDGNU_FORMAT
- && current_header->oldgnu_header.isextended)
- {
- union block *exhdr;
- do
- {
- exhdr = find_next_block ();
- if (!exhdr)
- FATAL_ERROR ((0, 0, _("Unexpected EOF in archive")));
- set_next_block_after (exhdr);
- }
- while (exhdr->sparse_header.isextended);
- }
+ assign_string (&save_name, current_stat_info.file_name);
- if (save_typeflag != DIRTYPE)
+ if (sparse_member_p (¤t_stat_info))
+ sparse_skip_file (¤t_stat_info);
+ else if (save_typeflag != DIRTYPE)
skip_file (current_stat_info.stat.st_size);
}