X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fdelete.c;h=a0a6d67c0b76033b09761fc7ad33ae1b741910c3;hb=5bb04335079011dfbd8547151d402b07ed152291;hp=d59a857f5f9b663adfbdab89f39eba048e7edf80;hpb=a0fb51e136d3df620eb3189683aae90b25bd8dd7;p=chaz%2Ftar diff --git a/src/delete.c b/src/delete.c index d59a857..a0a6d67 100644 --- a/src/delete.c +++ b/src/delete.c @@ -1,7 +1,7 @@ /* Delete entries from a tar archive. Copyright (C) 1988, 1992, 1994, 1996, 1997, 2000, 2001, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + 2005, 2006, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -35,7 +35,6 @@ extern union block *current_block; extern union block *recent_long_name; extern union block *recent_long_link; extern off_t records_read; -extern off_t records_written; /* The number of records skipped at the start of the archive, when passing over members that are not deleted. */ @@ -166,7 +165,9 @@ delete_archive_members (void) do { - enum read_header status = read_header (true); + enum read_header status = read_header (¤t_header, + ¤t_stat_info, + read_header_x_raw); switch (status) { @@ -261,7 +262,8 @@ delete_archive_members (void) if (current_block == record_end) flush_archive (); - status = read_header (false); + status = read_header (¤t_header, ¤t_stat_info, + read_header_auto); xheader_decode (¤t_stat_info); @@ -294,7 +296,7 @@ delete_archive_members (void) set_next_block_after (current_header); blocks_to_skip = (current_stat_info.stat.st_size + BLOCKSIZE - 1) / BLOCKSIZE; - + while (record_end - current_block <= blocks_to_skip) { blocks_to_skip -= (record_end - current_block);