[Scummvm-cvs-logs] SF.net SVN: scummvm: [23796] scummvm/trunk/backends/fs/dc

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Aug 28 15:34:29 CEST 2006


Revision: 23796
Author:   lordhoto
Date:     2006-08-28 06:34:15 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23796&view=rev

Log Message:
-----------
Fixing other FS backends to use the bug fixed version of the POSIX lastPathComponent too (also lets the Windows FS use the POSIX version of lastPathComponent too, since it's nicer than the fix I made)

Modified Paths:
--------------
    scummvm/trunk/backends/fs/dc/dc-fs.cpp
    scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
    scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
    scummvm/trunk/backends/fs/psp/psp_fs.cpp
    scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
    scummvm/trunk/backends/fs/windows/windows-fs.cpp
Modified: scummvm/trunk/backends/fs/dc/dc-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/dc/dc-fs.cpp	2006-08-28 13:17:36 UTC (rev 23795)
+++ scummvm/trunk/backends/fs/dc/dc-fs.cpp	2006-08-28 13:34:15 UTC (rev 23796)
@@ -59,13 +59,14 @@
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
-	while (cur > start && *cur != '/') {
+	while (cur >= start && *cur != '/') {
 		--cur;
 	}
 
 	return cur + 1;
 }
 
+
 AbstractFilesystemNode *AbstractFilesystemNode::getCurrentDirectory() {
 	// Since there is no way to _set_ the current directory,
 	// it will always be /...

Modified: scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs.cpp	2006-08-28 13:17:36 UTC (rev 23795)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs.cpp	2006-08-28 13:34:15 UTC (rev 23796)
@@ -194,11 +194,11 @@
 	return true;
 }
 
-const char *lastPathComponent(const Common::String &str) {
+static const char *lastPathComponent(const Common::String &str) {
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
-	while (cur > start && *cur != '\\') {
+	while (cur >= start && *cur != '/') {
 		--cur;
 	}
 

Modified: scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs.cpp	2006-08-28 13:17:36 UTC (rev 23795)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs.cpp	2006-08-28 13:34:15 UTC (rev 23796)
@@ -61,8 +61,9 @@
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
-	while (cur > start && *cur != '/')
+	while (cur >= start && *cur != '/') {
 		--cur;
+	}
 
 	return cur + 1;
 }

Modified: scummvm/trunk/backends/fs/psp/psp_fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp_fs.cpp	2006-08-28 13:17:36 UTC (rev 23795)
+++ scummvm/trunk/backends/fs/psp/psp_fs.cpp	2006-08-28 13:34:15 UTC (rev 23796)
@@ -133,11 +133,11 @@
 	}
 }
 
-const char *lastPathComponent(const Common::String &str) {
+static const char *lastPathComponent(const Common::String &str) {
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
-	while (cur > start && *cur != '/') {
+	while (cur >= start && *cur != '/') {
 		--cur;
 	}
 

Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp	2006-08-28 13:17:36 UTC (rev 23795)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp	2006-08-28 13:34:15 UTC (rev 23796)
@@ -62,7 +62,7 @@
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
-	while (cur > start && *cur != '\\') {
+	while (cur >= start && *cur != '/') {
 		--cur;
 	}
 

Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-08-28 13:17:36 UTC (rev 23795)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-08-28 13:34:15 UTC (rev 23796)
@@ -65,13 +65,10 @@
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
-	while (cur > start && *cur != '\\') {
+	while (cur >= start && *cur != '/') {
 		--cur;
 	}
 
-	if (cur == start)
-		return cur;
-
 	return cur + 1;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list