X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fdelete.c;h=d17dd2507ca22df96e68ce02625032e50af83395;hb=cd7bdd4076ca154575bbef85eb2157e59befcfe2;hp=e369a7af7efbbfd06f8fad57b991c18e0c85ac14;hpb=05b250d4a4db4b83e235677c674d789839037d4e;p=chaz%2Ftar
diff --git a/src/delete.c b/src/delete.c
index e369a7a..d17dd25 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,21 +1,22 @@
/* Delete entries from a tar archive.
- Copyright (C) 1988, 1992, 1994, 1996, 1997, 2000, 2001, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ Copyright 1988, 1992, 1994, 1996-1997, 2000-2001, 2003-2006, 2010,
+ 2013 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
- Free Software Foundation; either version 2, or (at your option) any later
- version.
+ This file is part of GNU tar.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
+ GNU tar is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ GNU tar is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include
#include
@@ -35,7 +36,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 +166,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)
{
@@ -174,7 +176,7 @@ delete_archive_members (void)
abort ();
case HEADER_SUCCESS:
- if ((name = name_scan (current_stat_info.file_name, false)) == NULL)
+ if ((name = name_scan (current_stat_info.file_name)) == NULL)
{
skip_member ();
break;
@@ -261,7 +263,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);
@@ -285,7 +288,7 @@ delete_archive_members (void)
/* Found another header. */
- if ((name = name_scan (current_stat_info.file_name, false)) != NULL)
+ if ((name = name_scan (current_stat_info.file_name)) != NULL)
{
name->found_count++;
if (ISFOUND(name))
@@ -294,7 +297,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);
@@ -307,10 +310,10 @@ delete_archive_members (void)
}
/* Copy header. */
- if (extended_header.size)
+ if (current_stat_info.xhdr.size)
{
- write_recent_bytes (extended_header.buffer,
- extended_header.size);
+ write_recent_bytes (current_stat_info.xhdr.buffer,
+ current_stat_info.xhdr.size);
}
else
{