Ticket #8906: os2fs.diff

common/str.cpp

@@ -550 +550 @@
         const char *cur = path.c_str();
         Common::String result;
 
+#ifdef __OS2__
+    // If there is a drive letter, preserve that:
+    if (cur[ 0 ] && cur[ 1 ] == ':')
+    {
+        result += cur[ 0 ];
+        result += ':';
+        cur += 2;
+    }
+#endif
+
         // If there is a leading slash, preserve that:
         if (*cur == sep) {
                 result += sep;

backends/fs/posix/posix-fs.cpp

@@ -124 +124 @@
                                 drive_root[2] = '/';
                                 drive_root[3] = 0;
         
-                                POSIXFilesystemNode entry;
+                // Start with a clone of this node, with the correct path set
+                POSIXFilesystemNode entry(*this);
         
                                 entry._isDirectory = true;
                                 entry._isValid = true;
@@ -161 +162 @@
                 POSIXFilesystemNode entry(*this);
                 entry._displayName = dp->d_name;
                 if (_path != "/")
+        #ifdef __OS2__
+            if (!(_path.size() == 2 && _path.hasSuffix(":")) &&
+                !(_path.size() == 3 && _path.hasSuffix(":/")))
+        #endif
                         entry._path += '/';
                 entry._path += entry._displayName;
 
@@ -212 +217 @@
         if (_path == "/")
                 return 0;       // The filesystem root has no parent
 
+#ifdef __OS2__
+    if (_path.size() == 3 && _path.hasSuffix(":/"))
+        // This is a root directory of a drive
+        return makeNode("/");   // return a virtual root for a list of drives
+#endif
+
         const char *start = _path.c_str();
         const char *end = start + _path.size();