X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5be0cf6503a67bcb7882f6c91b9bea0b07e95053..4004f41e3ce1655f9fa05c55a697ac0f8677c23a:/src/common/filesys.cpp?ds=sidebyside diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 120cfc28f0..1f9cbc486f 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -230,33 +230,33 @@ static wxString MakeCorrectPath(const wxString& path) cnt = p.Length(); for (i = 0; i < cnt; i++) - if (p[i] == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // wanna be windows-safe + if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; } if (cnt < 3) return p; - r << p[0] << p[1]; + r << p.GetChar(0) << p.GetChar(1); // skip trailing ../.., if any - for (i = 2; i < cnt && (p[i] == wxT('/') || p[i] == wxT('.')); i++) r << p[i]; + for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i); // remove back references: translate dir1/../dir2 to dir2 for (; i < cnt; i++) { - r << p[i]; - if (p[i] == wxT('/') && p[i-1] == wxT('.') && p[i-2] == wxT('.')) + r << p.GetChar(i); + if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.')) { - for (j = r.Length() - 2; j >= 0 && r[j] != wxT('/') && r[j] != wxT(':'); j--) {} - if (j >= 0 && r[j] != wxT(':')) + for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} + if (j >= 0 && r.GetChar(j) != wxT(':')) { - for (j = j - 1; j >= 0 && r[j] != wxT('/') && r[j] != wxT(':'); j--) {} + for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} r.Remove(j + 1); } } } - for (; i < cnt; i++) r << p[i]; + for (; i < cnt; i++) r << p.GetChar(i); return r; } @@ -382,7 +382,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags) m_FindFileHandler = NULL; for (int i = spec2.Length()-1; i >= 0; i--) - if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe + if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe node = m_Handlers.GetFirst(); while (node)