TarEntry handles longnames

https://sharpcompress.codeplex.com/workitem/42

SharpCompress.Test/Rar/RarArchiveTests.cs

@@ -15,12 +15,30 @@ namespace SharpCompress.Test
         {
             ArchiveStreamRead("Rar.none.rar");
         }
+
         [TestMethod]
         public void Rar_ArchiveStreamRead()
         {
             ArchiveStreamRead("Rar.rar");
         }
 
+
+        [TestMethod]
+        public void Rar_test_invalid_exttime_ArchiveStreamRead()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "test_invalid_exttime.rar")))
+            {
+                using (var archive = ArchiveFactory.Open(stream))
+                {
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+        }
+
         [TestMethod]
         public void Rar_Jpg_ArchiveStreamRead()
         {

SharpCompress.Test/Rar/RarReaderTests.cs

@@ -50,15 +50,18 @@ namespace SharpCompress.Test
             {
                 File.Copy(Path.Combine(TEST_ARCHIVES_PATH, file), Path.Combine(SCRATCH2_FILES_PATH, file));
             }
-
-            using (var reader = RarReader.Open(testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s))
-                .Select(p => File.OpenRead(p)), Options.None))
+            var streams = testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)).Select(File.OpenRead).ToList();
+            using (var reader = RarReader.Open(streams))
             {
                 while (reader.MoveToNextEntry())
                 {
                     reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
                 }
             }
+            foreach (var stream in streams)
+            {
+                stream.Dispose();
+            }
             VerifyFiles();
 
             foreach (var file in testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)))

SharpCompress.Test/Tar/TarArchiveTests.cs

@@ -54,6 +54,22 @@ namespace SharpCompress.Test
             }
             CompareArchivesByPath(unmodified, scratchPath);
         }
+
+        [TestMethod]
+        public void Tar_Create_New_Long_FileName()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.tar");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Create())
+            {
+                archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            CompareArchivesByPath(unmodified, scratchPath);
+        }
+
         [TestMethod]
         public void Tar_Random_Write_Add()
         {
@@ -71,6 +87,23 @@ namespace SharpCompress.Test
             CompareArchivesByPath(modified, scratchPath);
         }
 
+                [TestMethod]
+        public void Tar_Random_Write_Add_Long_name()
+        {
+            string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg\\test.jpg");
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Create())
+            {
+                archive.AddEntry(@"very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg", jpg);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar");
+
+
+            CompareArchivesByPath(unmodified, scratchPath);
+        }
         [TestMethod]
         public void Tar_Random_Write_Remove()
         {

SharpCompress.sln

@@ -1,6 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet\sharpcompress.nuspec = NuGet\sharpcompress.nuspec
+	EndProjectSection
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress", "SharpCompress\SharpCompress.csproj", "{10A689CF-76A2-4A4F-96E4-553C33398438}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test", "SharpCompress.Test\SharpCompress.Test.csproj", "{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}"
@@ -13,13 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.PortableTest"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test.Portable", "SharpCompress.Test\SharpCompress.Test.Portable.csproj", "{E9C3C94B-FB27-4B4F-B225-57513C254D37}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet\sharpcompress.nuspec = NuGet\sharpcompress.nuspec
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,8 +57,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 		{E9C3C94B-FB27-4B4F-B225-57513C254D37} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 	EndGlobalSection
 EndGlobal

SharpCompress/Archive/Tar/TarArchive.cs

@@ -100,7 +100,7 @@ namespace SharpCompress.Archive.Tar
         {
             try
             {
-                TarHeader tar = new TarHeader();
+                TarHeader tar = new TarHeader(EntryType.File);
                 tar.Read(new BinaryReader(stream));
                 return tar.Name.Length > 0 && Enum.IsDefined(typeof (EntryType), tar.EntryType);
             }

SharpCompress/Common/Rar/Headers/FileHeader.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Text;
 using SharpCompress.IO;
 
 namespace SharpCompress.Common.Rar.Headers
@@ -15,7 +14,7 @@ namespace SharpCompress.Common.Rar.Headers
         {
             uint lowUncompressedSize = reader.ReadUInt32();
 
-            HostOS = (HostOS) (int) reader.ReadByte();
+            HostOS = (HostOS)reader.ReadByte();
 
             FileCRC = reader.ReadUInt32();
 
@@ -46,7 +45,7 @@ namespace SharpCompress.Common.Rar.Headers
             CompressedSize = UInt32To64(highCompressedSize, AdditionalSize);
             UncompressedSize = UInt32To64(highUncompressedkSize, lowUncompressedSize);
 
-            nameSize = nameSize > 4*1024 ? (short) (4*1024) : nameSize;
+            nameSize = nameSize > 4 * 1024 ? (short)(4 * 1024) : nameSize;
 
             byte[] fileNameBytes = reader.ReadBytes(nameSize);
 
@@ -106,11 +105,16 @@ namespace SharpCompress.Common.Rar.Headers
             }
             if (FileFlags.HasFlag(FileFlags.EXTTIME))
             {
-                ushort extendedFlags = reader.ReadUInt16();
-                FileLastModifiedTime = ProcessExtendedTime(extendedFlags, FileLastModifiedTime, reader, 0);
-                FileCreatedTime = ProcessExtendedTime(extendedFlags, null, reader, 1);
-                FileLastAccessedTime = ProcessExtendedTime(extendedFlags, null, reader, 2);
-                FileArchivedTime = ProcessExtendedTime(extendedFlags, null, reader, 3);
+                // verify that the end of the header hasn't been reached before reading the Extended Time.
+                //  some tools incorrectly omit Extended Time despite specifying FileFlags.EXTTIME, which most parsers tolerate.
+                if (ReadBytes + reader.CurrentReadByteCount <= HeaderSize - 2)
+                {
+                    ushort extendedFlags = reader.ReadUInt16();
+                    FileLastModifiedTime = ProcessExtendedTime(extendedFlags, FileLastModifiedTime, reader, 0);
+                    FileCreatedTime = ProcessExtendedTime(extendedFlags, null, reader, 1);
+                    FileLastAccessedTime = ProcessExtendedTime(extendedFlags, null, reader, 2);
+                    FileArchivedTime = ProcessExtendedTime(extendedFlags, null, reader, 3);
+                }
             }
         }
 
@@ -130,7 +134,7 @@ namespace SharpCompress.Common.Rar.Headers
         private static DateTime? ProcessExtendedTime(ushort extendedFlags, DateTime? time, MarkingBinaryReader reader,
                                                      int i)
         {
-            uint rmode = (uint) extendedFlags >> (3 - i)*4;
+            uint rmode = (uint)extendedFlags >> (3 - i) * 4;
             if ((rmode & 8) == 0)
             {
                 return null;
@@ -145,14 +149,14 @@ namespace SharpCompress.Common.Rar.Headers
                 time = time.Value.AddSeconds(1);
             }
             uint nanosecondHundreds = 0;
-            int count = (int) rmode & 3;
+            int count = (int)rmode & 3;
             for (int j = 0; j < count; j++)
             {
                 byte b = reader.ReadByte();
-                nanosecondHundreds |= (((uint) b) << ((j + 3 - count)*8));
+                nanosecondHundreds |= (((uint)b) << ((j + 3 - count) * 8));
             }
             //10^-7 to 10^-3
-            return time.Value.AddMilliseconds(nanosecondHundreds*Math.Pow(10, -4));
+            return time.Value.AddMilliseconds(nanosecondHundreds * Math.Pow(10, -4));
         }
 
         private static string ConvertPath(string path, HostOS os)
@@ -205,7 +209,7 @@ namespace SharpCompress.Common.Rar.Headers
 
         internal FileFlags FileFlags
         {
-            get { return (FileFlags) base.Flags; }
+            get { return (FileFlags)base.Flags; }
         }
 
         internal long CompressedSize { get; private set; }

SharpCompress/Common/Rar/Headers/RarHeader.cs

@@ -38,7 +38,7 @@ namespace SharpCompress.Common.Rar.Headers
         protected virtual void ReadFromReader(MarkingBinaryReader reader)
         {
             HeadCRC = reader.ReadInt16();
-            HeaderType = (HeaderType)(int)(reader.ReadByte() & 0xff);
+            HeaderType = (HeaderType)(reader.ReadByte() & 0xff);
             Flags = reader.ReadInt16();
             HeaderSize = reader.ReadInt16();
             if (FlagUtility.HasFlag(Flags, LONG_BLOCK))

SharpCompress/Common/Rar/RarCryptoBinaryReader.cs

@@ -30,7 +30,6 @@ namespace SharpCompress.Common.Rar
 
         public override byte[] ReadBytes(int count)
         {
-            CurrentReadByteCount += count;
             if (UseEncryption)
             {
                 return ReadAndDecryptBytes(count);

SharpCompress/Common/Tar/Headers/TarHeader.cs

@@ -27,6 +27,11 @@ namespace SharpCompress.Common.Tar.Headers
     {
         internal static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0);
 
+        internal TarHeader(EntryType entryType)
+        {
+            EntryType = entryType;
+        }
+
         internal string Name { get; set; }
         //internal int Mode { get; set; }
         //internal int UserId { get; set; }
@@ -37,7 +42,10 @@ namespace SharpCompress.Common.Tar.Headers
         internal DateTime LastModifiedTime { get; set; }
         internal EntryType EntryType { get; set; }
         internal Stream PackedStream { get; set; }
-
+        internal static bool IsPathSeparator(char ch)
+        {
+            return (ch == '\\' || ch == '/' || ch == '|'); // All the path separators I ever met.
+        }
         internal void Write(Stream output)
         {
             if (Name.Length > 255)
@@ -46,12 +54,29 @@ namespace SharpCompress.Common.Tar.Headers
             }
             byte[] buffer = new byte[512];
             string name = Name;
+            string namePrefix = null;
             if (name.Length > 100)
             {
-                name = Name.Substring(0, 100);
-            }
-            WriteStringBytes(name, buffer, 0, 100);
+                int position = Name.Length - 100;
 
+                // Find first path separator in the remaining 100 chars of the file name
+                while (!IsPathSeparator(Name[position]))
+                {
+                    ++position;
+                    if (position == Name.Length)
+                    {
+                        break;
+                    }
+                }
+                if (position == Name.Length)
+                {
+                    position = Name.Length - 100;
+                }
+                namePrefix = Name.Substring(0, position);
+                name = Name.Substring(position, Name.Length - position);
+            }
+
+            Encoding.ASCII.GetBytes(name.PadRight(100, '\0')).CopyTo(buffer, 0);
             WriteOctalBytes(511, buffer, 100, 8);
             WriteOctalBytes(0, buffer, 108, 8);
             WriteOctalBytes(0, buffer, 116, 8);
@@ -59,13 +84,16 @@ namespace SharpCompress.Common.Tar.Headers
             var time = (long) (LastModifiedTime - Epoch).TotalSeconds;
             WriteOctalBytes(time, buffer, 136, 12);
 
-            buffer[156] = (byte) EntryType;
 
-            //Encoding.UTF8.GetBytes("magic").CopyTo(buffer, 257);
-            if (Name.Length > 100)
+            if (namePrefix != null)
             {
-                name = Name.Substring(101, Name.Length);
-                ArchiveEncoding.Default.GetBytes(name).CopyTo(buffer, 345);
+                Encoding.ASCII.GetBytes(namePrefix).CopyTo(buffer, 347);
+                Encoding.ASCII.GetBytes("ustar").CopyTo(buffer, 0x101);
+                Encoding.ASCII.GetBytes(" ").CopyTo(buffer, 0x106);
+            }
+            else
+            {
+                buffer[156] = (byte)EntryType;
             }
             if (Size >= 0x1FFFFFFFF)
             {
@@ -95,7 +123,7 @@ namespace SharpCompress.Common.Tar.Headers
             {
                 throw new InvalidOperationException();
             }
-            Name = ArchiveEncoding.Default.GetString(buffer, 0, 100).TrimNulls();
+            Name = Encoding.ASCII.GetString(buffer, 0, 100).TrimNulls();
 
             //Mode = ReadASCIIInt32Base8(buffer, 100, 7);
             //UserId = ReadASCIIInt32Base8(buffer, 108, 7);
@@ -118,39 +146,20 @@ namespace SharpCompress.Common.Tar.Headers
             LastModifiedTime = Epoch.AddSeconds(unixTimeStamp);
 
 
-            Magic = ArchiveEncoding.Default.GetString(buffer, 257, 6).TrimNulls();
+            Magic = Encoding.ASCII.GetString(buffer, 257, 5).TrimNulls();
 
-            if (!string.IsNullOrEmpty(Magic) && "ustar ".Equals(Magic))
+            if (!string.IsNullOrEmpty(Magic) && "ustar".Equals(Magic))
             {
                 string namePrefix = ArchiveEncoding.Default.GetString(buffer, 345, 157);
                 namePrefix = namePrefix.TrimNulls();
                 if (!string.IsNullOrEmpty(namePrefix))
                 {
-                    Name = namePrefix + "/" + Name;
+                    Name = namePrefix + Name;
                 }
             }
-            if (EntryType != EntryType.LongName && Name.Length == 0)
-            {
-                return false;
-            }
             return true;
         }
-
-        private static void WriteStringBytes(string name, byte[] buffer, int offset, int length)
-        {
-            int i;
-
-            for (i = 0; i < length - 1 && i < name.Length; ++i)
-            {
-                buffer[offset + i] = (byte) name[i];
-            }
-
-            for (; i < length; ++i)
-            {
-                buffer[offset + i] = 0;
-            }
-        }
-
+        
         private static void WriteOctalBytes(long value, byte[] buffer, int offset, int length)
         {
             string val = Convert.ToString(value, 8);
@@ -166,16 +175,6 @@ namespace SharpCompress.Common.Tar.Headers
             buffer[offset + length] = 0;
         }
 
-        private static int ReadASCIIInt32Base8(byte[] buffer, int offset, int count)
-        {
-            string s = Encoding.UTF8.GetString(buffer, offset, count).TrimNulls();
-            if (string.IsNullOrEmpty(s))
-            {
-                return 0;
-            }
-            return Convert.ToInt32(s, 8);
-        }
-
         private static long ReadASCIIInt64Base8(byte[] buffer, int offset, int count)
         {
             string s = Encoding.UTF8.GetString(buffer, offset, count).TrimNulls();
@@ -186,16 +185,6 @@ namespace SharpCompress.Common.Tar.Headers
             return Convert.ToInt64(s, 8);
         }
 
-        private static long ReadASCIIInt64(byte[] buffer, int offset, int count)
-        {
-            string s = Encoding.UTF8.GetString(buffer, offset, count).TrimNulls();
-            if (string.IsNullOrEmpty(s))
-            {
-                return 0;
-            }
-            return Convert.ToInt64(s);
-        }
-
         internal static int RecalculateChecksum(byte[] buf)
         {
             // Set default value for checksum. That is 8 spaces.

SharpCompress/Common/Tar/TarEntry.cs

@@ -85,17 +85,34 @@ namespace SharpCompress.Common.Tar
         internal static IEnumerable<TarEntry> GetEntries(StreamingMode mode, Stream stream,
                                                          CompressionType compressionType)
         {
+            string nextHeaderName = null;
             foreach (TarHeader h in TarHeaderFactory.ReadHeader(mode, stream))
             {
                 if (h != null)
                 {
-                    if (mode == StreamingMode.Seekable)
+                    if (h.EntryType == EntryType.LongName)
                     {
-                        yield return new TarEntry(new TarFilePart(h, stream), compressionType);
+                        var memoryStream = new MemoryStream();
+                        h.PackedStream.CopyTo(memoryStream);
+                        memoryStream.Position = 0;
+                        var bytes = memoryStream.ToArray();
+                        nextHeaderName = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
                     }
                     else
                     {
-                        yield return new TarEntry(new TarFilePart(h, null), compressionType);
+                        if (nextHeaderName != null)
+                        {
+                            h.Name = nextHeaderName;
+                            nextHeaderName = null;
+                        }
+                        if (mode == StreamingMode.Seekable)
+                        {
+                            yield return new TarEntry(new TarFilePart(h, stream), compressionType);
+                        }
+                        else
+                        {
+                            yield return new TarEntry(new TarFilePart(h, null), compressionType);
+                        }
                     }
                 }
             }

SharpCompress/Common/Tar/TarHeaderFactory.cs

@@ -15,7 +15,7 @@ namespace SharpCompress.Common.Tar
                 try
                 {
                     BinaryReader reader = new BinaryReader(stream);
-                    header = new TarHeader();
+                    header = new TarHeader(EntryType.File);
                     if (!header.Read(reader))
                     {
                         yield break;

SharpCompress/IO/MarkingBinaryReader.cs

@@ -12,7 +12,7 @@ namespace SharpCompress.IO
         {
         }
 
-        public long CurrentReadByteCount { get; protected set; }
+        public long CurrentReadByteCount { get; private set; }
 
         public void Mark()
         {

SharpCompress/SharpCompress.Portable.csproj

@@ -9,12 +9,18 @@
     <RootNamespace>SharpCompress</RootNamespace>
     <AssemblyName>SharpCompress</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile1</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Profile136</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
     <BaseIntermediateOutputPath>obj\Portable\</BaseIntermediateOutputPath>
     <RestorePackages>true</RestorePackages>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

SharpCompress/SharpCompress.WindowsStore.csproj

@@ -302,12 +302,21 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="SharpCompress.pfx" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

SharpCompress/Writer/Tar/TarWriter.cs

@@ -65,7 +65,7 @@ namespace SharpCompress.Writer.Tar
             long realSize = size ?? source.Length;
 
 
-            TarHeader header = new TarHeader();
+            TarHeader header = new TarHeader(EntryType.File);
             header.LastModifiedTime = modificationTime ?? TarHeader.Epoch;
             header.Name = NormalizeFilename(filename);
             header.Size = realSize;