Merge pull request #65 from ermshiperete/issue54

Fix handling of paths on Linux and Mac (issue #54)

Author: jfreilly

.gitignore

@@ -0,0 +1,2 @@
+bin/
+obj/

src/Checksums/CRC32.cs src/Checksums/Crc32.cssrc/Checksums/CRC32.cs renamed to src/Checksums/Crc32.cs

@@ -100,7 +100,7 @@ public string TransformDirectory(string name)
 		{
 			name = TransformFile(name);
 			if (name.Length > 0) {
-				while ( name.EndsWith(@"\") ) {
+				while ( name.EndsWith(Path.DirectorySeparatorChar.ToString()) ) {
 					name = name.Remove(name.Length - 1, 1);
 				}
 			}
@@ -186,23 +186,23 @@ public static string MakeValidName(string name, char replacement)
 				throw new ArgumentNullException("name");
 			}
 
-			name = WindowsPathUtils.DropPathRoot(name.Replace("/", @"\"));
+			name = WindowsPathUtils.DropPathRoot(name.Replace("/", Path.DirectorySeparatorChar.ToString()));
 
 			// Drop any leading slashes.
-			while ( (name.Length > 0) && (name[0] == '\\')) {
+			while ( (name.Length > 0) && (name[0] == Path.DirectorySeparatorChar)) {
 				name = name.Remove(0, 1);
 			}
 
 			// Drop any trailing slashes.
-			while ( (name.Length > 0) && (name[name.Length - 1] == '\\')) {
+			while ( (name.Length > 0) && (name[name.Length - 1] == Path.DirectorySeparatorChar)) {
 				name = name.Remove(name.Length - 1, 1);
 			}
 
 			// Convert consecutive \\ characters to \
-			int index = name.IndexOf(@"\\");
+			int index = name.IndexOf(string.Format("{0}{0}", Path.DirectorySeparatorChar));
 			while (index >= 0) {
 				name = name.Remove(index, 1);
-				index = name.IndexOf(@"\\");
+				index = name.IndexOf(Path.DirectorySeparatorChar);
 			}
 
 			// Convert any invalid characters using the replacement one.
@@ -245,7 +245,7 @@ public char Replacement
 					}
 				}
 
-				if ((value == '\\') || (value == '/')) {
+				if ((value == Path.DirectorySeparatorChar) || (value == Path.AltDirectorySeparatorChar)) {
 					throw new ArgumentException("invalid replacement character");
 				}
 

src/Checksums/StrangeCRC.cs src/Checksums/StrangeCrc.cssrc/Checksums/StrangeCRC.cs renamed to src/Checksums/StrangeCrc.cs

@@ -1057,10 +1057,10 @@ public void BasicFiles()
 			wnt.TrimIncomingPaths = false;
 
 			TestFile(wnt, "Bogan", "Bogan");
-			TestFile(wnt, "absolute/file2", @"absolute\file2");
-			TestFile(wnt, "C:/base/////////t", @"base\t");
-			TestFile(wnt, "//unc/share/zebidi/and/dylan", @"zebidi\and\dylan");
-			TestFile(wnt, @"\\unc\share\/zebidi\/and\/dylan", @"zebidi\and\dylan");
+			TestFile(wnt, "absolute/file2", Path.Combine("absolute", "file2"));
+			TestFile(wnt, "C:/base/////////t", Path.Combine("base", "t"));
+			TestFile(wnt, "//unc/share/zebidi/and/dylan", Path.Combine("zebidi", "and", "dylan"));
+			TestFile(wnt, @"\\unc\share\/zebidi\/and\/dylan", Path.Combine("zebidi", "and", "dylan"));
 		}
 
 		[Test]
@@ -1070,7 +1070,7 @@ public void Replacement()
 			wnt.TrimIncomingPaths = false;
 
 			TestFile(wnt, "c::", "_");
-			TestFile(wnt, "c\\/>", @"c\_");
+			TestFile(wnt, "c\\/>", Path.Combine("c", "_"));
 		}
 
 		[Test]
@@ -1150,12 +1150,12 @@ public void BasicDirectories()
 			TestDirectory(wnt, "d", "d");
 			TestDirectory(wnt, "absolute/file2", @"absolute\file2");
 
-			const string BaseDir1 =  @"C:\Dir";
+			string BaseDir1 =  Path.Combine("C:", "Dir");
 			wnt.BaseDirectory = BaseDir1;
 
 			TestDirectory(wnt, "talofa", Path.Combine(BaseDir1 , "talofa"));
 
-			const string BaseDir2 = @"C:\Dir\";
+			string BaseDir2 = string.Format(@"C:{0}Dir{0}", Path.DirectorySeparatorChar);
 			wnt.BaseDirectory = BaseDir2;
 
 			TestDirectory(wnt, "talofa", Path.Combine(BaseDir2, "talofa"));