Ticket #53: vfs.patch

plugins/filesys/vfs/vfs.cpp

@@ -22 +22 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef __CYGWIN__
+#include <sys/cygwin.h>
+#endif
 
 #include "vfs.h"
 #include "csutil/archive.h"
@@ -982 +985 @@
       rc = true;
       UPathV.Push (src);
 
-      // Now parse this path
-      char rpath [CS_MAXPATHLEN + 1];
-      size_t len = strlen (src);
-      len = MIN (len, CS_MAXPATHLEN);
-      memcpy (rpath, src, len);
-      rpath[len] = '\0';
-      RPathV.Push (rpath);
+#ifdef __CYGWIN__
+      // Convert any cygwin paths to win32 paths
+      char rpath[MAX_PATH];
+      if (cygwin_conv_to_win32_path(src, rpath) == 0)
+        RPathV.Push (rpath);
+      else
+        RPathV.Push (src);
+#else
+      RPathV.Push (src);
+#endif
       src = cur + 1;
     } /* endif */
   } /* for */
@@ -1007 +1013 @@
   } /* endif */
   csString const expanded_path = Expand(Parent, RealPath);
   size_t i;
-  for (i = 0; i < RPathV.Length (); i++)
-    if (strcmp ((char *)RPathV.Get (i), expanded_path) == 0)
+  for (i = 0; i < UPathV.Length (); i++)
+    if (strcmp ((char *)UPathV.Get (i), expanded_path) == 0)
     {
       RPathV.DeleteIndex (i);
       UPathV.DeleteIndex (i);