X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=2d05873d846b327a3e91aa4e6452ebf9865d5b39;hb=84378fa99ae3ce256fea9eb25d8ae999d1c91fdf;hp=af210cf8f48659ed9fbd1dff91582ec870379599;hpb=8f1d2fd9c34120b010e9c25fe93d195eea83d8c6;p=chaz%2Ftar

diff --git a/src/list.c b/src/list.c
index af210cf..2d05873 100644
--- 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.
 
@@ -205,55 +205,24 @@ read_and (void (*do_something) (void))
 void
 list_archive (void)
 {
+  off_t block_ordinal = current_block_ordinal ();
   /* Print the header block.  */
 
   decode_header (current_header, &current_stat_info, &current_format, 0);
   if (verbose_option)
-    print_header (&current_stat_info, -1);
-  
-  if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR)
-    {
-      off_t size;
-      size_t written, check;
-      union block *data_block;
+    print_header (&current_stat_info, block_ordinal);
 
-      set_next_block_after (current_header);
-      if (multi_volume_option)
-	{
-	  assign_string (&save_name, current_stat_info.orig_file_name);
-	  save_totsize = current_stat_info.stat.st_size;
-	}
-      for (size = current_stat_info.stat.st_size; size > 0; size -= written)
+  if (incremental_option)
+    {
+      if (verbose_option > 2)
 	{
-	  if (multi_volume_option)
-	    save_sizeleft = size;
-	  data_block = find_next_block ();
-	  if (!data_block)
-	    {
-	      ERROR ((0, 0, _("Unexpected EOF in archive")));
-	      break;		/* FIXME: What happens, then?  */
-	    }
-	  written = available_space_after (data_block);
-	  if (written > size)
-	    written = size;
-	  set_next_block_after ((union block *)
-				(data_block->buffer + written - 1));
-	  if (verbose_option > 2)
-	    list_dumpdir (data_block->buffer, written);
+	  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, 0);
-
-      return;
     }
 
-  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 */
@@ -425,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!  */
@@ -601,7 +571,14 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
       stat_info->is_sparse = true;
     }
   else
-    stat_info->is_sparse = false;
+    {
+      stat_info->is_sparse = false;
+      if (((current_format == GNU_FORMAT
+	    || current_format == OLDGNU_FORMAT)
+	   && current_header->header.typeflag == GNUTYPE_DUMPDIR)
+          || stat_info->dumpdir)
+	stat_info->is_dumpdir = true;
+    }
 }
 
 /* Convert buffer at WHERE0 of size DIGS from external format to
@@ -1011,7 +988,25 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
 
   if (test_label_option && current_header->header.typeflag != GNUTYPE_VOLHDR)
     return;
-  
+
+  if (show_stored_names_option)
+    {
+      switch (subcommand_option)
+	{
+	case CAT_SUBCOMMAND:
+	case UPDATE_SUBCOMMAND:
+	case APPEND_SUBCOMMAND:
+	case CREATE_SUBCOMMAND:
+	  temp_name = st->file_name ? st->file_name : st->orig_file_name;
+	  break;
+
+	default:
+	  temp_name = st->orig_file_name ? st->orig_file_name : st->file_name;
+	}
+    }
+  else
+    temp_name = st->orig_file_name ? st->orig_file_name : st->file_name;
+
   if (block_number_option)
     {
       char buf[UINTMAX_STRSIZE_BOUND];
@@ -1270,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 ();
@@ -1297,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);
     }
 }
 
@@ -1307,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 ();
+    }
 }