Merge PR #295: Fix ZipEntry name mismatch when attempting to delete a directory entry

Author: benleedom

src/ICSharpCode.SharpZipLib/Zip/ZipFile.cs

@@ -2461,7 +2461,9 @@ private void CopyEntryDataDirect(ZipUpdate update, Stream stream, bool updateCrc
 		private int FindExistingUpdate(ZipEntry entry)
 		{
 			int result = -1;
-			string convertedName = GetTransformedFileName(entry.Name);
+			string convertedName = entry.IsDirectory
+				? GetTransformedDirectoryName(entry.Name)
+				: GetTransformedFileName(entry.Name);
 
 			if (updateIndex_.ContainsKey(convertedName))
 			{

test/ICSharpCode.SharpZipLib.Tests/Zip/ZipFileHandling.cs

@@ -403,24 +403,36 @@ public void AddAndDeleteEntries()
 			string addFile2 = Path.Combine(tempFile, "b.dat");
 			MakeTempFile(addFile2, 259);
 
+			string addDirectory = Path.Combine(tempFile, "dir");
+
 			tempFile = Path.Combine(tempFile, "SharpZipTest.Zip");
 
 			using (ZipFile f = ZipFile.Create(tempFile))
 			{
 				f.BeginUpdate();
 				f.Add(addFile);
 				f.Add(addFile2);
+				f.AddDirectory(addDirectory);
 				f.CommitUpdate();
 				Assert.IsTrue(f.TestArchive(true));
 			}
 
 			using (ZipFile f = new ZipFile(tempFile))
 			{
-				Assert.AreEqual(2, f.Count);
+				Assert.AreEqual(3, f.Count);
 				Assert.IsTrue(f.TestArchive(true));
+
+				// Delete file
 				f.BeginUpdate();
 				f.Delete(f[0]);
 				f.CommitUpdate();
+				Assert.AreEqual(2, f.Count);
+				Assert.IsTrue(f.TestArchive(true));
+
+				// Delete directory
+				f.BeginUpdate();
+				f.Delete(f[1]);
+				f.CommitUpdate();
 				Assert.AreEqual(1, f.Count);
 				Assert.IsTrue(f.TestArchive(true));
 			}