--strip strips file system prefix too, and it counts adjacent

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index d7aba0d95bad075c08e8f61b3d95af7af997b92e..26fcecbc49230fd62acc6e218be8d22e3ef1ca25 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -719,12 +719,13 @@ extract_archive (void)
   file_name = safer_name_suffix (current_stat_info.file_name, 0);
   if (strip_path_elements)
     {
-      file_name = cut_path_elements (file_name, strip_path_elements);
-      if (!file_name)
+      size_t prefix_len = stripped_prefix_len (file_name, strip_path_elements);
+      if (prefix_len == (size_t) -1)
        {
          skip_member ();
          return;
        }
+      file_name += prefix_len;
     }
   
   apply_nonancestor_delayed_set_stat (file_name, 0);