X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=5bbd3cbe25ac594ea0aba28bb9c0bc05d12d3858;hb=35f5b4881520894420b479eb09bd2a50d1a91726;hp=633713ac41d3e5093f3331385134e43b05066de9;hpb=8952196bc15293e0bb6b3dcc035fc1b93209154d;p=chaz%2Ftar

diff --git a/src/list.c b/src/list.c
index 633713a..5bbd3cb 100644
--- a/src/list.c
+++ b/src/list.c
@@ -99,8 +99,8 @@ read_and (void (*do_something) (void))
 		      /* FIXME: Grab fractional time stamps from
 			 extended header.  */
 		      mtime.tv_nsec = 0,
-		      set_stat_mtime (&current_stat_info.stat, mtime),
-		      OLDER_STAT_TIME (current_stat_info.stat, m)))
+		      current_stat_info.mtime = mtime,
+		      OLDER_TAR_STAT_TIME (current_stat_info, m)))
 	      || excluded_name (current_stat_info.file_name))
 	    {
 	      switch (current_header->header.typeflag)
@@ -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)
+      if (verbose_option > 2)
 	{
-	  assign_string (&save_name, current_stat_info.orig_file_name);
-	  save_totsize = current_stat_info.stat.st_size;
+	  if (current_stat_info.dumpdir)
+	    list_dumpdir (current_stat_info.dumpdir,
+			  dumpdir_size (current_stat_info.dumpdir));
 	}
-      for (size = current_stat_info.stat.st_size; size > 0; size -= written)
-	{
-	  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 (multi_volume_option)
-	assign_string (&save_name, 0);
-      
-      return;
     }
 
   if (multi_volume_option)
@@ -512,9 +487,6 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
 	       enum archive_format *format_pointer, int do_user_group)
 {
   enum archive_format format;
-  struct timespec atime;
-  struct timespec ctime;
-  struct timespec mtime;
 
   if (strcmp (header->header.magic, TMAGIC) == 0)
     {
@@ -536,9 +508,8 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
   *format_pointer = format;
 
   stat_info->stat.st_mode = MODE_FROM_HEADER (header->header.mode);
-  mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime);
-  mtime.tv_nsec = 0;
-  set_stat_mtime (&stat_info->stat, mtime);
+  stat_info->mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime);
+  stat_info->mtime.tv_nsec = 0;
   assign_string (&stat_info->uname,
 		 header->header.uname[0] ? header->header.uname : NULL);
   assign_string (&stat_info->gname,
@@ -546,21 +517,18 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
 
   if (format == OLDGNU_FORMAT && incremental_option)
     {
-      atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime);
-      ctime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.ctime);
-      atime.tv_nsec = ctime.tv_nsec = 0;
+      stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime);
+      stat_info->ctime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.ctime);
+      stat_info->atime.tv_nsec = stat_info->ctime.tv_nsec = 0;
     }
   else if (format == STAR_FORMAT)
     {
-      atime.tv_sec = TIME_FROM_HEADER (header->star_header.atime);
-      ctime.tv_sec = TIME_FROM_HEADER (header->star_header.ctime);
-      atime.tv_nsec = ctime.tv_nsec = 0;
+      stat_info->atime.tv_sec = TIME_FROM_HEADER (header->star_header.atime);
+      stat_info->ctime.tv_sec = TIME_FROM_HEADER (header->star_header.ctime);
+      stat_info->atime.tv_nsec = stat_info->ctime.tv_nsec = 0;
     }
   else
-    atime = ctime = start_time;
-
-  set_stat_atime (&stat_info->stat, atime);
-  set_stat_ctime (&stat_info->stat, ctime);
+    stat_info->atime = stat_info->ctime = start_time;
 
   if (format == V7_FORMAT)
     {
@@ -608,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
@@ -1016,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];
@@ -1094,7 +1089,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
 
       /* Time stamp.  */
 
-      time_stamp = tartime (get_stat_mtime (&st->stat), false);
+      time_stamp = tartime (st->mtime, false);
       time_stamp_len = strlen (time_stamp);
       if (datewidth < time_stamp_len)
 	datewidth = time_stamp_len;