Changeset 388 for ps

Timestamp:

06/03/04 19:34:49 (21 years ago)

Author:

Simon Brenner

Message:

\ handling for vfs entity resolver.. ugly as hell, but works :P

File:

• ps/trunk/source/ps/XMLUtils.cpp (modified) (4 diffs)

ps/trunk/source/ps/XMLUtils.cpp

@@ -1 +1 @@
 #include "XML.h"
 #include "CStr.h"
+#include "CLogger.h"
 
 #include "res/vfs.h"
@@ -25 +26 @@
 
     m_hFile=vfs_open(path);
-    if (m_hFile <= 0) return -1;
+    if (m_hFile <= 0)
+    {
+        LOG(ERROR, "CVFSInputSource: file %s couldn't be opened (vfs_open)\n", path);
+        return -1;
+    }
     
-    if (vfs_map(m_hFile, 0, m_pBuffer, m_BufferSize) != 0)
+    int err;
+    if ((err=vfs_map(m_hFile, 0, m_pBuffer, m_BufferSize)) != 0)
     {
+        LOG(ERROR, "CVFSInputSource: file %s couldn't be opened (vfs_map: %d)\n", path, err);
         vfs_close(m_hFile);
         m_hFile=0;
@@ -68 +75 @@
     char *orgpath=path;
     
-    CStr base=m_DocName;
-    const char *end=m_DocName+base.Length();
-    if (strncmp(path, "../", 3) == 0)
+    CStr abspath=m_DocName;
+    const char *end=m_DocName+abspath.Length();
+    if (strncmp(path, "..", 2) == 0 && (path[2] == '/' || path[2] == '\\'))
     {
         do
             --end;
-        while (end > m_DocName && *end != '/');
+        while (end > m_DocName && (*end != '/' && *end != '\\'));
 
-        while (strncmp(path, "../", 3) == 0)
+        while (strncmp(path, "..", 2) == 0 && (path[2] == '/' || path[2] == '\\'))
         {
             path += 3;
@@ -82 +89 @@
             do
                 --end;
-            while (end > m_DocName && *end != '/');
+            while (end > m_DocName && (*end != '/' && *end != '\\'));
         }
         
         --path;
+        
+        abspath=abspath.Left(end-m_DocName)+path;
+        
+        int pos=0;
+        if (abspath.Find('\\') != -1)
+        {
+            LOG(WARNING, "While resolving XML entities for %s: path %s [%s] contains non-portable path separator \\", m_DocName, orgpath, abspath.c_str());
+            abspath.Replace("\\", "/");
+        }
     }
     
-    if (
-        (orgpath != path &&
-            ret->OpenFile((base.Left(end-m_DocName)+path).c_str())!=0)
+    if ((orgpath != path && ret->OpenFile(abspath)!=0)
         || (orgpath == path && ret->OpenFile(path)!=0))
     {