* NEWS: Remove support for mangled names.

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index d346f79ac272a04344ed7e78ccafe55aa28a14fa..d391e3e3372c0340b58e398203f2b5e6197ce5fe 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -193,7 +193,7 @@ check_time (char const *file_name, struct timespec t)
   if (t.tv_sec <= 0)
     WARN ((0, 0, _("%s: implausibly old time stamp %s"),
           file_name, tartime (t, true)));
-  else if (timespec_cmp (start_time, t) < 0)
+  else if (timespec_cmp (volume_start_time, t) < 0)
     {
       struct timespec now;
       gettime (&now);
@@ -871,7 +871,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
       if (h && ! h->after_links
          && strncmp (file_name, h->file_name, h->file_name_len) == 0
          && ISSLASH (file_name[h->file_name_len])
-         && (base_name (file_name) == file_name + h->file_name_len + 1))
+         && (last_component (file_name) == file_name + h->file_name_len + 1))
        {
          do
            {
@@ -1024,13 +1024,14 @@ extract_fifo (char *file_name, int typeflag)
 #endif
 
 static int
-extract_mangle_wrapper (char *file_name, int typeflag)
+extract_volhdr (char *file_name, int typeflag)
 {
-  extract_mangle ();
+  if (verbose_option)
+    fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
+  skip_member ();
   return 0;
 }
 
-
 static int
 extract_failure (char *file_name, int typeflag)
 {
@@ -1110,13 +1111,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;
-      break;
-
-    case GNUTYPE_NAMES:
-      *fun = extract_mangle_wrapper;
+      *fun = extract_volhdr;
       break;
 
     case GNUTYPE_MULTIVOL:
@@ -1177,51 +1172,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 +1211,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
@@ -1339,10 +1320,10 @@ rename_directory (char *src, char *dst)
              e = errno;
            }
          break;
-                   
+
        case EXDEV:
          /* FIXME: Fall back to recursive copying */
-         
+
        default:
          break;
        }
@@ -1354,7 +1335,7 @@ rename_directory (char *src, char *dst)
     }
   return true;
 }
-      
+
 void
 fatal_exit (void)
 {