[Scummvm-git-logs] scummvm master -> 4d2e1d16b1540553a330f0a74826bb5782e278de

[criezy]

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

Summary:
509b12de65 RISCOS: Fix using filenames with spaces
4d2e1d16b1 RISCOS: Improve detection of absolute paths


Commit: 509b12de6599605ece2e64bd96ae72b60c2c52c4
    https://github.com/scummvm/scummvm/commit/509b12de6599605ece2e64bd96ae72b60c2c52c4
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2017-11-28T22:23:58Z

Commit Message:
RISCOS: Fix using filenames with spaces

Changed paths:
    backends/fs/riscos/riscos-fs.cpp


diff --git a/backends/fs/riscos/riscos-fs.cpp b/backends/fs/riscos/riscos-fs.cpp
index 38d150e..34d7877 100644
--- a/backends/fs/riscos/riscos-fs.cpp
+++ b/backends/fs/riscos/riscos-fs.cpp
@@ -93,6 +93,9 @@ Common::String RISCOSFilesystemNode::toUnix(Common::String &path) {
 		case '/':
 			out.setChar('.', ptr);
 			break;
+		case '\xA0':
+			out.setChar(' ', ptr);
+			break;
 		default:
 			break;
 		}


Commit: 4d2e1d16b1540553a330f0a74826bb5782e278de
    https://github.com/scummvm/scummvm/commit/4d2e1d16b1540553a330f0a74826bb5782e278de
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2017-11-28T22:23:58Z

Commit Message:
RISCOS: Improve detection of absolute paths

Changed paths:
    backends/fs/riscos/riscos-fs.cpp


diff --git a/backends/fs/riscos/riscos-fs.cpp b/backends/fs/riscos/riscos-fs.cpp
index 34d7877..7ee20e7 100644
--- a/backends/fs/riscos/riscos-fs.cpp
+++ b/backends/fs/riscos/riscos-fs.cpp
@@ -83,6 +83,9 @@ Common::String RISCOSFilesystemNode::toUnix(Common::String &path) {
 	if (out.contains("$")) {
 		char *x = strstr(out.c_str(), "$");
 		start = x ? x - out.c_str() : -1;
+	} else if (out.contains(":")) {
+		char *x = strstr(out.c_str(), ":");
+		start = x ? x - out.c_str() : -1;
 	}
 
 	for (uint32 ptr = start; ptr < out.size(); ptr += 1) {
@@ -101,7 +104,7 @@ Common::String RISCOSFilesystemNode::toUnix(Common::String &path) {
 		}
 	}
 
-	if (out.contains("$"))
+	if (out.contains("$") || out.contains(":"))
 		out = "/" + out;
 
 	return out;