1 From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001

     2 From: Paul Eggert <[email protected]>

     3 Date: Mon, 15 Nov 2010 08:07:53 +0000

     4 Subject: tar: fix --verify option, which broke in 1.24

     5 

     6 * src/compare.c (verify_volume): Decode the header before invoking

     7 diff_archive, as diff_archive no longer does this as of the

     8 2010-06-28 commit.  Also, don't try to invoke diff_archive on a

     9 zero block.

    10 ---

    11 diff --git a/src/compare.c b/src/compare.c

    12 index 6b7e6d8..f3112c6 100644

    13 --- a/src/compare.c

    14 +++ b/src/compare.c

    15 @@ -611,8 +611,10 @@ verify_volume (void)

    16  		       (0, 0, _("A lone zero block at %s"),

    17  			STRINGIFY_BIGINT (current_block_ordinal (), buf)));

    18              }

    19 +	  continue;

    20  	}

    21  

    22 +      decode_header (current_header, &current_stat_info, &current_format, 1);

    23        diff_archive ();

    24        tar_stat_destroy (&current_stat_info);

    25      }