[Scummvm-cvs-logs] scummvm master -> 7c23eae1027d242c9169b791d99d5f22e3159816

bluegr bluegr at gmail.com
Sun Jan 18 20:31:13 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7c23eae102 ZVISION: Fix path handling in case-sensitive file systems (bug #6775)


Commit: 7c23eae1027d242c9169b791d99d5f22e3159816
    https://github.com/scummvm/scummvm/commit/7c23eae1027d242c9169b791d99d5f22e3159816
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-18T21:30:07+02:00

Commit Message:
ZVISION: Fix path handling in case-sensitive file systems (bug #6775)

A regression from commit d70503cc98. Thanks to wjp for bisecting.

Changed paths:
    engines/zvision/file/search_manager.cpp



diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 9f709dd..1ae1ff7 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -183,6 +183,16 @@ bool SearchManager::loadZix(const Common::String &name) {
 				path.deleteChar(0);
 			if (path.size() && path.hasSuffix("/"))
 				path.deleteLastChar();
+			
+			// Handle paths in case-sensitive file systems (bug #6775)
+			if (path.size()) {
+				for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it) {
+					if (path.equalsIgnoreCase(*it)) {
+						path = *it;
+						break;
+					}
+				}
+			}
 
 			if (path.matchString("*.zfs", true)) {
 				arc = new ZfsArchive(path);






More information about the Scummvm-git-logs mailing list