* NEWS: Remove support for mangled names.

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index c64206a882531307e3413985c884ec84ce9d8bfd..d391e3e3372c0340b58e398203f2b5e6197ce5fe 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -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
            {
@@ -1023,19 +1023,13 @@ extract_fifo (char *file_name, int typeflag)
 }
 #endif
 
-static int
-extract_mangle_wrapper (char *file_name, int typeflag)
-{
-  extract_mangle ();
-  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 ();
+  return 0;
 }
 
 static int
@@ -1120,10 +1114,6 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
       *fun = extract_volhdr;
       break;
 
-    case GNUTYPE_NAMES:
-      *fun = extract_mangle_wrapper;
-      break;
-
     case GNUTYPE_MULTIVOL:
       ERROR ((0, 0,
              _("%s: Cannot extract -- file is continued from another volume"),
@@ -1330,10 +1320,10 @@ rename_directory (char *src, char *dst)
              e = errno;
            }
          break;
-                   
+
        case EXDEV:
          /* FIXME: Fall back to recursive copying */
-         
+
        default:
          break;
        }
@@ -1345,7 +1335,7 @@ rename_directory (char *src, char *dst)
     }
   return true;
 }
-      
+
 void
 fatal_exit (void)
 {