From 9d70caef0a236b576cbc74124a0e7ccc96d4ae1e Mon Sep 17 00:00:00 2001
From: aramis_acg <aramis_acg@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Mon, 23 Aug 2010 18:52:53 +0000
Subject: [PATCH] [3031725] FileSystemFilter destroys "://" in paths. Addresss
 this issue. FileSystemFilter now acts with more caution, first tries to open
 the file given the input path.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@801 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
---
 code/FileSystemFilter.h | 47 ++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/code/FileSystemFilter.h b/code/FileSystemFilter.h
index 4ae62488c..4db72147b 100644
--- a/code/FileSystemFilter.h
+++ b/code/FileSystemFilter.h
@@ -119,15 +119,29 @@ public:
 	/** Open a new file with a given path. */
 	IOStream* Open( const char* pFile, const char* pMode = "rb")
 	{
-		std::string tmp = pFile;
+		ai_assert(pFile);
+		ai_assert(pMode);
 
-		// Currently this IOSystem is also used to open THE ONE FILE.
-		if (tmp != src_file)	{
+		// First try the unchanged path
+		IOStream* s = wrapped->Open(pFile,pMode);
+
+		if (!s)	{
+			std::string tmp = pFile;
+
+			// Try to convert between absolute and relative paths
 			BuildPath(tmp);
-			Cleanup(tmp);
-		}
+			s = wrapped->Open(tmp,pMode);
 
-		return wrapped->Open(tmp,pMode);
+			if (!s) {
+				// Finally, look for typical issues with paths
+				// and try to correct them. This is our last
+				// resort.
+				Cleanup(tmp);
+				s = wrapped->Open(tmp,pMode);
+			}
+		}
+		
+		return s;
 	}
 
 	// -------------------------------------------------------------------
@@ -158,7 +172,7 @@ private:
 			return;
 		}
 
-		// Determine whether this is a relative path. 
+		// Determine whether this is a relative path (Windows-specific - most assets are packaged on Windows). 
 		if (in[1] != ':') {
 		
 			// append base path and try 
@@ -179,7 +193,7 @@ private:
 		char last = 0;
 
 		// Remove a very common issue when we're parsing file names: spaces at the
-		// beginning of the path.
+		// beginning of the path. 
 		std::string::iterator it = in.begin();
 		while (IsSpaceOrNewLine( *it ))++it;
 		if (it != in.begin())
@@ -187,9 +201,18 @@ private:
 
 		const char sep = getOsSeparator();
 		for (it = in.begin(); it != in.end(); ++it) {
-			
-			// Both Windows and Linux accept both separators, but to avoid conflicts
-			// or mixed seperators in a single path we're cleaning up.
+			// Exclude :// and \\, which remain untouched.
+			// https://sourceforge.net/tracker/?func=detail&aid=3031725&group_id=226462&atid=1067632
+			if ( !strncmp(&*it, "://", 3 )) {
+				it += 3;
+				continue;
+			}
+			if (it == in.begin() && !strncmp(&*it, "\\\\", 2)) {
+				it += 2;
+				continue;
+			}
+
+			// Cleanup path delimiters
 			if (*it == '/' || (*it) == '\\') {
 				*it = sep;
 
@@ -202,7 +225,7 @@ private:
 			}
 			else if (*it == '%' && in.end() - it > 2) {
 			
-				// Hex sequence, common _artifact_ in URIs
+				// Hex sequence in URIs
 				uint32_t tmp;
 				if( 0xffffffff != (tmp = HexOctetToDecimal(&*it))) {
 					*it = (char)tmp;