X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=2d05873d846b327a3e91aa4e6452ebf9865d5b39;hb=783e58b39411f6db86cbbb9c210a448e47115340;hp=633713ac41d3e5093f3331385134e43b05066de9;hpb=8952196bc15293e0bb6b3dcc035fc1b93209154d;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index 633713a..2d05873 100644 --- a/src/list.c +++ b/src/list.c @@ -1,7 +1,7 @@ /* List a tar archive, with support routines for reading a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, - 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-26. @@ -99,8 +99,8 @@ read_and (void (*do_something) (void)) /* FIXME: Grab fractional time stamps from extended header. */ mtime.tv_nsec = 0, - set_stat_mtime (¤t_stat_info.stat, mtime), - OLDER_STAT_TIME (current_stat_info.stat, m))) + current_stat_info.mtime = mtime, + OLDER_TAR_STAT_TIME (current_stat_info, m))) || excluded_name (current_stat_info.file_name)) { switch (current_header->header.typeflag) @@ -205,55 +205,24 @@ read_and (void (*do_something) (void)) void list_archive (void) { + off_t block_ordinal = current_block_ordinal (); /* Print the header block. */ decode_header (current_header, ¤t_stat_info, ¤t_format, 0); if (verbose_option) - print_header (¤t_stat_info, -1); + print_header (¤t_stat_info, block_ordinal); - if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR) + if (incremental_option) { - off_t size; - size_t written, check; - union block *data_block; - - set_next_block_after (current_header); - if (multi_volume_option) - { - assign_string (&save_name, current_stat_info.orig_file_name); - save_totsize = current_stat_info.stat.st_size; - } - for (size = current_stat_info.stat.st_size; size > 0; size -= written) + if (verbose_option > 2) { - if (multi_volume_option) - save_sizeleft = size; - data_block = find_next_block (); - if (!data_block) - { - ERROR ((0, 0, _("Unexpected EOF in archive"))); - break; /* FIXME: What happens, then? */ - } - written = available_space_after (data_block); - if (written > size) - written = size; - set_next_block_after ((union block *) - (data_block->buffer + written - 1)); - if (verbose_option > 2) - list_dumpdir (data_block->buffer, written); + if (is_dumpdir (¤t_stat_info)) + list_dumpdir (current_stat_info.dumpdir, + dumpdir_size (current_stat_info.dumpdir)); } - if (multi_volume_option) - assign_string (&save_name, 0); - - return; } - if (multi_volume_option) - assign_string (&save_name, current_stat_info.orig_file_name); - skip_member (); - - if (multi_volume_option) - assign_string (&save_name, 0); } /* Check header checksum */ @@ -425,6 +394,7 @@ read_header (bool raw_extended_headers) { xheader_read (header, OFF_FROM_HEADER (header->header.size)); xheader_decode_global (); + xheader_destroy (&extended_header); } /* Loop! */ @@ -512,9 +482,6 @@ decode_header (union block *header, struct tar_stat_info *stat_info, enum archive_format *format_pointer, int do_user_group) { enum archive_format format; - struct timespec atime; - struct timespec ctime; - struct timespec mtime; if (strcmp (header->header.magic, TMAGIC) == 0) { @@ -536,9 +503,8 @@ decode_header (union block *header, struct tar_stat_info *stat_info, *format_pointer = format; stat_info->stat.st_mode = MODE_FROM_HEADER (header->header.mode); - mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime); - mtime.tv_nsec = 0; - set_stat_mtime (&stat_info->stat, mtime); + stat_info->mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime); + stat_info->mtime.tv_nsec = 0; assign_string (&stat_info->uname, header->header.uname[0] ? header->header.uname : NULL); assign_string (&stat_info->gname, @@ -546,21 +512,18 @@ decode_header (union block *header, struct tar_stat_info *stat_info, if (format == OLDGNU_FORMAT && incremental_option) { - atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime); - ctime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.ctime); - atime.tv_nsec = ctime.tv_nsec = 0; + stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime); + stat_info->ctime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.ctime); + stat_info->atime.tv_nsec = stat_info->ctime.tv_nsec = 0; } else if (format == STAR_FORMAT) { - atime.tv_sec = TIME_FROM_HEADER (header->star_header.atime); - ctime.tv_sec = TIME_FROM_HEADER (header->star_header.ctime); - atime.tv_nsec = ctime.tv_nsec = 0; + stat_info->atime.tv_sec = TIME_FROM_HEADER (header->star_header.atime); + stat_info->ctime.tv_sec = TIME_FROM_HEADER (header->star_header.ctime); + stat_info->atime.tv_nsec = stat_info->ctime.tv_nsec = 0; } else - atime = ctime = start_time; - - set_stat_atime (&stat_info->stat, atime); - set_stat_ctime (&stat_info->stat, ctime); + stat_info->atime = stat_info->ctime = start_time; if (format == V7_FORMAT) { @@ -608,7 +571,14 @@ decode_header (union block *header, struct tar_stat_info *stat_info, stat_info->is_sparse = true; } else - stat_info->is_sparse = false; + { + stat_info->is_sparse = false; + if (((current_format == GNU_FORMAT + || current_format == OLDGNU_FORMAT) + && current_header->header.typeflag == GNUTYPE_DUMPDIR) + || stat_info->dumpdir) + stat_info->is_dumpdir = true; + } } /* Convert buffer at WHERE0 of size DIGS from external format to @@ -1016,6 +986,27 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) int pad; int sizelen; + if (test_label_option && current_header->header.typeflag != GNUTYPE_VOLHDR) + return; + + if (show_stored_names_option) + { + switch (subcommand_option) + { + case CAT_SUBCOMMAND: + case UPDATE_SUBCOMMAND: + case APPEND_SUBCOMMAND: + case CREATE_SUBCOMMAND: + temp_name = st->file_name ? st->file_name : st->orig_file_name; + break; + + default: + temp_name = st->orig_file_name ? st->orig_file_name : st->file_name; + } + } + else + temp_name = st->orig_file_name ? st->orig_file_name : st->file_name; + if (block_number_option) { char buf[UINTMAX_STRSIZE_BOUND]; @@ -1094,7 +1085,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) /* Time stamp. */ - time_stamp = tartime (get_stat_mtime (&st->stat), false); + time_stamp = tartime (st->mtime, false); time_stamp_len = strlen (time_stamp); if (datewidth < time_stamp_len) datewidth = time_stamp_len; @@ -1274,25 +1265,19 @@ skip_file (off_t size) { union block *x; - if (multi_volume_option) - { - save_totsize = size; - save_sizeleft = size; - } + /* FIXME: Make sure mv_begin is always called before it */ if (seekable_archive) { off_t nblk = seek_archive (size); if (nblk >= 0) - { - size -= nblk * BLOCKSIZE; - if (multi_volume_option) /* Argh.. */ - save_sizeleft -= nblk * BLOCKSIZE; - } + size -= nblk * BLOCKSIZE; else seekable_archive = false; } + mv_size_left (size); + while (size > 0) { x = find_next_block (); @@ -1301,8 +1286,7 @@ skip_file (off_t size) set_next_block_after (x); size -= BLOCKSIZE; - if (multi_volume_option) - save_sizeleft -= BLOCKSIZE; + mv_size_left (size); } } @@ -1311,13 +1295,18 @@ skip_file (off_t size) void skip_member (void) { - char save_typeflag = current_header->header.typeflag; - set_next_block_after (current_header); + if (!current_stat_info.skipped) + { + char save_typeflag = current_header->header.typeflag; + set_next_block_after (current_header); + + mv_begin (¤t_stat_info); - assign_string (&save_name, current_stat_info.orig_file_name); + if (current_stat_info.is_sparse) + sparse_skip_file (¤t_stat_info); + else if (save_typeflag != DIRTYPE) + skip_file (current_stat_info.stat.st_size); - if (current_stat_info.is_sparse) - sparse_skip_file (¤t_stat_info); - else if (save_typeflag != DIRTYPE) - skip_file (current_stat_info.stat.st_size); + mv_end (); + } }