X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=80ea0e19bc7dfb1d296968a9d329da6eaff27223;hb=86a9b9261ddc45dd1c380179173baebd77e2ba3e;hp=13140eb5873472734d80e134f86b81157fd112ac;hpb=096bc2bffd857a690a9364043c33109eee0a53b4;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index 13140eb..80ea0e1 100644 --- a/src/list.c +++ b/src/list.c @@ -175,12 +175,9 @@ list_archive (void) { /* Print the header block. */ + decode_header (current_header, ¤t_stat_info, ¤t_format, 0); if (verbose_option) - { - if (verbose_option > 1) - decode_header (current_header, ¤t_stat_info, ¤t_format, 0); - print_header (-1); - } + print_header (-1); if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR) { @@ -548,7 +545,7 @@ decode_header (union block *header, struct tar_stat_info *stat_info, } } - if (extended_header.nblocks) + if (extended_header.size) xheader_decode (stat_info); } @@ -1021,9 +1018,9 @@ print_header (off_t block_ordinal) /* User and group names. */ - if (*current_header->header.uname && current_format != V7_FORMAT + if (current_stat_info.uname && current_format != V7_FORMAT && !numeric_owner_option) - user = current_header->header.uname; + user = current_stat_info.uname; else { /* Try parsing it as an unsigned integer first, and as a @@ -1043,9 +1040,9 @@ print_header (off_t block_ordinal) } } - if (*current_header->header.gname && current_format != V7_FORMAT + if (current_stat_info.gname && current_format != V7_FORMAT && !numeric_owner_option) - group = current_header->header.gname; + group = current_stat_info.gname; else { /* Try parsing it as an unsigned integer first, and as a