fe198e6
From: Pavel Raiskup <praiskup@redhat.com>
fe198e6
Date: Mon, 14 Sep 2015 09:49:12 +0200
fe198e6
Subject: [PATCH 6/7] Fix for splitting long file names while creating ustar
fe198e6
 archive
fe198e6
fe198e6
Resolves: #866467
fe198e6
65fa937
diff --git a/src/tar.c b/src/tar.c
fe198e6
index a2ce171..e2b5f45 100644
65fa937
--- a/src/tar.c
65fa937
+++ b/src/tar.c
fe198e6
@@ -49,10 +49,12 @@ split_long_name (const char *name, size_t length)
65fa937
 {
65fa937
   size_t i;
65fa937
 
65fa937
-  if (length > TARPREFIXSIZE)
65fa937
-    length = TARPREFIXSIZE+2;
65fa937
+  if (length > TARPREFIXSIZE + 1)
65fa937
+    length = TARPREFIXSIZE + 1;
65fa937
+  else if (ISSLASH (name[length - 1]))
65fa937
+    length--;
65fa937
   for (i = length - 1; i > 0; i--)
65fa937
-    if (name[i] == '/')
65fa937
+    if (ISSLASH (name[i]))
65fa937
       break;
65fa937
   return i;
65fa937
 }