Read POSIX multivolume archives split at the header boundary.

[chaz/tar] / src / delete.c

diff --git a/src/delete.c b/src/delete.c
index a98694175aa4888deeff50a8b6699620db6edde3..75dc01f8961f532bcccd87e18924236f58e01690 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,11 +1,11 @@
 /* Delete entries from a tar archive.
 
 /* Delete entries from a tar archive.
 

-   Copyright (C) 1988, 1992, 1994, 1996, 1997, 2000, 2001, 2003 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988, 1992, 1994, 1996, 1997, 2000, 2001, 2003, 2004,
+   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
 
    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
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -15,9 +15,10 @@
 
    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.,
 
    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.,

-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

 
 #include <system.h>
 
 #include <system.h>

+#include <system-ioctl.h>

 
 #include "common.h"
 #include <rmt.h>
 
 #include "common.h"
 #include <rmt.h>


@@ -33,12 +34,11 @@ extern union block *record_end;
 extern union block *current_block;
 extern union block *recent_long_name;
 extern union block *recent_long_link;
 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;
+extern off_t records_read;

 
 /* The number of records skipped at the start of the archive, when
    passing over members that are not deleted.  */
 
 /* The number of records skipped at the start of the archive, when
    passing over members that are not deleted.  */

-static off_t records_skipped;
+off_t records_skipped;

 
 /* Move archive descriptor by COUNT records worth.  If COUNT is
    positive we move forward, else we move negative.  If it's a tape,
 
 /* Move archive descriptor by COUNT records worth.  If COUNT is
    positive we move forward, else we move negative.  If it's a tape,


@@ -165,7 +165,9 @@ delete_archive_members (void)
 
   do
     {
 
   do
     {

-      enum read_header status = read_header (true);
+      enum read_header status = read_header (&current_header,
+                                             &current_stat_info,
+                                             read_header_x_raw);

 
       switch (status)
        {
 
       switch (status)
        {


@@ -184,7 +186,7 @@ delete_archive_members (void)
              skip_member ();
              break;
            }
              skip_member ();
              break;
            }

-         
+

          /* Fall through.  */
        case HEADER_SUCCESS_EXTENDED:
          logical_status = status;
          /* Fall through.  */
        case HEADER_SUCCESS_EXTENDED:
          logical_status = status;


@@ -260,10 +262,11 @@ delete_archive_members (void)
 
          if (current_block == record_end)
            flush_archive ();
 
          if (current_block == record_end)
            flush_archive ();

-         status = read_header (false);
-         
+         status = read_header (&current_header, &current_stat_info, 
+                               read_header_auto);
+

          xheader_decode (&current_stat_info);
          xheader_decode (&current_stat_info);

-         
+

          if (status == HEADER_ZERO_BLOCK && ignore_zeros_option)
            {
              set_next_block_after (current_header);
          if (status == HEADER_ZERO_BLOCK && ignore_zeros_option)
            {
              set_next_block_after (current_header);


@@ -293,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;
                  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);
                  while (record_end - current_block <= blocks_to_skip)
                    {
                      blocks_to_skip -= (record_end - current_block);


@@ -306,10 +309,10 @@ delete_archive_members (void)
            }
          /* Copy header.  */
 
            }
          /* 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
            {
            }
          else
            {