From c8c29c490b06885cfea6afd440f7aff4ee19edc3 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 10 Dec 2002 09:48:00 +0000 Subject: [PATCH] Ignore DOS drive spec in GetRightLocation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filesys.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 781dc5c909..e646253301 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -127,7 +127,16 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const { int i, l = location.Length(); int l2 = l + 1; - for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) {if (location[i] == wxT('#')) l2 = i + 1;} +// for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) + for (i = l-1; + (i >= 0) && + (((location[i] != wxT(':')) || ((i >= 2) && (location[i-2] == wxT('/')))) || // Ignore e.g. /c:/ component + (i == 1) || + (location[i-2] == wxT(':')) + ); i--) + { + if (location[i] == wxT('#')) l2 = i + 1; + } if (i == 0) return wxEmptyString; else return location.Mid(i + 1, l2 - i - 2); }