X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=15fb9f2525c20b546bcb61e5e241329ca7eba949;hb=973b6112902adbe0a16dfec69c405ca90a843cee;hp=d346f79ac272a04344ed7e78ccafe55aa28a14fa;hpb=a0b4431f26a72addb201c306ae02c2e12c2d5092;p=chaz%2Ftar

diff --git a/src/extract.c b/src/extract.c
index d346f79..15fb9f2 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -1030,6 +1030,13 @@ extract_mangle_wrapper (char *file_name, int typeflag)
   return 0;
 }
 
+static int
+extract_volhdr (char *file_name, int typeflag)
+{
+  if (verbose_option)
+    fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
+  skip_member ();
+}
 
 static int
 extract_failure (char *file_name, int typeflag)
@@ -1110,9 +1117,7 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
       break;
 
     case GNUTYPE_VOLHDR:
-      if (verbose_option)
-	fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
-      *fun = NULL;
+      *fun = extract_volhdr;
       break;
 
     case GNUTYPE_NAMES:
@@ -1177,51 +1182,36 @@ void
 extract_archive (void)
 {
   char typeflag;
-  char *file_name;
   tar_extractor_t fun;
 
   set_next_block_after (current_header);
   decode_header (current_header, &current_stat_info, &current_format, 1);
-
-  if (interactive_option && !confirm ("extract", current_stat_info.file_name))
+  if (!current_stat_info.file_name[0]
+      || (interactive_option
+	  && !confirm ("extract", current_stat_info.file_name)))
     {
       skip_member ();
       return;
     }
 
   /* Print the block from current_header and current_stat.  */
-
   if (verbose_option)
     print_header (&current_stat_info, -1);
 
-  file_name = safer_name_suffix (current_stat_info.file_name,
-                                 false, absolute_names_option);
-  if (strip_name_components)
-    {
-      size_t prefix_len = stripped_prefix_len (file_name,
-					       strip_name_components);
-      if (prefix_len == (size_t) -1)
-	{
-	  skip_member ();
-	  return;
-	}
-      file_name += prefix_len;
-    }
-
   /* Restore stats for all non-ancestor directories, unless
      it is an incremental archive.
      (see NOTICE in the comment to delay_set_stat above) */
   if (!delay_directory_restore_option)
-    apply_nonancestor_delayed_set_stat (file_name, 0);
+    apply_nonancestor_delayed_set_stat (current_stat_info.file_name, 0);
 
   /* Take a safety backup of a previously existing file.  */
 
   if (backup_option)
-    if (!maybe_backup_file (file_name, 0))
+    if (!maybe_backup_file (current_stat_info.file_name, 0))
       {
 	int e = errno;
 	ERROR ((0, e, _("%s: Was unable to backup this file"),
-		quotearg_colon (file_name)));
+		quotearg_colon (current_stat_info.file_name)));
 	skip_member ();
 	return;
       }
@@ -1231,9 +1221,10 @@ extract_archive (void)
   typeflag = sparse_member_p (&current_stat_info) ?
                   GNUTYPE_SPARSE : current_header->header.typeflag;
 
-  if (prepare_to_extract (file_name, typeflag, &fun))
+  if (prepare_to_extract (current_stat_info.file_name, typeflag, &fun))
     {
-      if (fun && (*fun) (file_name, typeflag) && backup_option)
+      if (fun && (*fun) (current_stat_info.file_name, typeflag)
+	  && backup_option)
 	undo_last_backup ();
     }
   else