* gnulib.modules: Add closeout, exitfial.

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 5bbd3cbe25ac594ea0aba28bb9c0bc05d12d3858..2d05873d846b327a3e91aa4e6452ebf9865d5b39 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -1,7 +1,7 @@
 /* List a tar archive, with support routines for reading a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
-   2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    Written by John Gilmore, on 1985-08-26.
 
@@ -211,24 +211,18 @@ list_archive (void)
   decode_header (current_header, &current_stat_info, &current_format, 0);
   if (verbose_option)
     print_header (&current_stat_info, block_ordinal);
-  
+
   if (incremental_option)
     {
       if (verbose_option > 2)
        {
-         if (current_stat_info.dumpdir)
+         if (is_dumpdir (&current_stat_info))
            list_dumpdir (current_stat_info.dumpdir,
                          dumpdir_size (current_stat_info.dumpdir));
        }
     }
 
-  if (multi_volume_option)
-    assign_string (&save_name, current_stat_info.orig_file_name);
-
   skip_member ();
-
-  if (multi_volume_option)
-    assign_string (&save_name, 0);
 }
 
 /* Check header checksum */
@@ -400,6 +394,7 @@ read_header (bool raw_extended_headers)
            {
              xheader_read (header, OFF_FROM_HEADER (header->header.size));
              xheader_decode_global ();
+             xheader_destroy (&extended_header);
            }
 
          /* Loop!  */
@@ -578,10 +573,11 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
   else
     {
       stat_info->is_sparse = false;
-      if ((current_format == GNU_FORMAT
-          || current_format == OLDGNU_FORMAT)
-         && current_header->header.typeflag == GNUTYPE_DUMPDIR)
-       get_gnu_dumpdir ();
+      if (((current_format == GNU_FORMAT
+           || current_format == OLDGNU_FORMAT)
+          && current_header->header.typeflag == GNUTYPE_DUMPDIR)
+          || stat_info->dumpdir)
+       stat_info->is_dumpdir = true;
     }
 }
 
@@ -1010,7 +1006,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
     }
   else
     temp_name = st->orig_file_name ? st->orig_file_name : st->file_name;
-  
+
   if (block_number_option)
     {
       char buf[UINTMAX_STRSIZE_BOUND];
@@ -1269,25 +1265,19 @@ skip_file (off_t size)
 {
   union block *x;
 
-  if (multi_volume_option)
-    {
-      save_totsize = size;
-      save_sizeleft = size;
-    }
+  /* FIXME: Make sure mv_begin is always called before it */
 
   if (seekable_archive)
     {
       off_t nblk = seek_archive (size);
       if (nblk >= 0)
-       {
-         size -= nblk * BLOCKSIZE;
-         if (multi_volume_option) /* Argh.. */
-           save_sizeleft -= nblk * BLOCKSIZE;
-       }
+       size -= nblk * BLOCKSIZE;
       else
        seekable_archive = false;
     }
 
+  mv_size_left (size);
+
   while (size > 0)
     {
       x = find_next_block ();
@@ -1296,8 +1286,7 @@ skip_file (off_t size)
 
       set_next_block_after (x);
       size -= BLOCKSIZE;
-      if (multi_volume_option)
-       save_sizeleft -= BLOCKSIZE;
+      mv_size_left (size);
     }
 }
 
@@ -1306,13 +1295,18 @@ skip_file (off_t size)
 void
 skip_member (void)
 {
-  char save_typeflag = current_header->header.typeflag;
-  set_next_block_after (current_header);
+  if (!current_stat_info.skipped)
+    {
+      char save_typeflag = current_header->header.typeflag;
+      set_next_block_after (current_header);
+
+      mv_begin (&current_stat_info);
 
-  assign_string (&save_name, current_stat_info.orig_file_name);
+      if (current_stat_info.is_sparse)
+       sparse_skip_file (&current_stat_info);
+      else if (save_typeflag != DIRTYPE)
+       skip_file (current_stat_info.stat.st_size);
 
-  if (current_stat_info.is_sparse)
-    sparse_skip_file (&current_stat_info);
-  else if (save_typeflag != DIRTYPE)
-    skip_file (current_stat_info.stat.st_size);
+      mv_end ();
+    }
 }