From 87cf3e64bd3b02b4f968aec9c00a0e4f07df49b0 Mon Sep 17 00:00:00 2001 From: nakeee Date: Tue, 3 Mar 2009 10:21:13 +0000 Subject: [PATCH] Fixed few \ on code that suppose to work on linux as well. That most fixed something, probably some crash and some iso properties issue:) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2536 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DiscIO/Src/FileHandlerARC.cpp | 4 ++-- Source/Core/DiscIO/Src/FileSystemGCWii.cpp | 4 ++-- Source/Core/DolphinWX/Src/ISOProperties.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp index ae8b96ac6d..b87590de05 100644 --- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp @@ -209,11 +209,11 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons // this is a directory, build up the new szDirectory if (_szDirectory != NULL) { - sprintf(rFileInfo.m_FullPath, "%s%s\\", _szDirectory, &_szNameTable[uOffset]); + sprintf(rFileInfo.m_FullPath, "%s%s/", _szDirectory, &_szNameTable[uOffset]); } else { - sprintf(rFileInfo.m_FullPath, "%s\\", &_szNameTable[uOffset]); + sprintf(rFileInfo.m_FullPath, "%s/", &_szNameTable[uOffset]); } CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable); diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index e251d6f93a..4afdad5a73 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -225,9 +225,9 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _ { // this is a directory, build up the new szDirectory if (_szDirectory != NULL) - CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s\\", _szDirectory, filename); + CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s/", _szDirectory, filename); else - CharArrayFromFormat(rFileInfo->m_FullPath, "%s\\", filename); + CharArrayFromFormat(rFileInfo->m_FullPath, "%s/", filename); CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset); } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index b7e429241c..907e41a3f7 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -118,7 +118,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW // Filesystem browser/dumper fileIter beginning = Our_Files.begin(), end = Our_Files.end(), pos = Our_Files.begin(); - CreateDirectoryTree(RootId, beginning, end, pos, (char *)"\\"); + CreateDirectoryTree(RootId, beginning, end, pos, (char *)"/"); m_Treectrl->Expand(RootId); std::string filename, extension; @@ -160,7 +160,7 @@ void CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, if((*iterPos)->IsDirectory()) { char *dirName; name[strlen(name) - 1] = '\0'; - dirName = strrchr(name, '\\'); + dirName = strrchr(name, DIR_SEP_CHR); if(!dirName) dirName = name; else @@ -169,7 +169,7 @@ void CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, wxTreeItemId item = m_Treectrl->AppendItem(parent, wxString::FromAscii(dirName)); CreateDirectoryTree(item, begin, end, ++iterPos, name); } else { - char *fileName = strrchr(name, '\\'); + char *fileName = strrchr(name, DIR_SEP_CHR); if(!fileName) fileName = name; else @@ -475,7 +475,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event)) { wxString temp; temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); - File = temp + _T("\\") + File; + File = temp + _T(DIR_SEP_CHR) + File; m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); }