X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=5bbd3cbe25ac594ea0aba28bb9c0bc05d12d3858;hb=f6458a827ae7a2c41616490f653714068072b257;hp=d8591634380ed81e62264a16ad07f7612c9ccf9a;hpb=3209329337c87a102fa12d7eb60a3df323ba56c1;p=chaz%2Ftar

diff --git a/src/list.c b/src/list.c
index d859163..5bbd3cb 100644
--- a/src/list.c
+++ b/src/list.c
@@ -205,46 +205,21 @@ 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)
+    print_header (&current_stat_info, block_ordinal);
+  
+  if (incremental_option)
     {
-      off_t size;
-      size_t written, check;
-      union block *data_block;
-
-      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 (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 (current_stat_info.dumpdir)
+	    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)
@@ -601,7 +576,13 @@ 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)
+	get_gnu_dumpdir ();
+    }
 }
 
 /* Convert buffer at WHERE0 of size DIGS from external format to
@@ -1009,6 +990,27 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
   int pad;
   int sizelen;
 
+  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];