ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Windows file handling for recent relative path fixes. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2532 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2012-06-07 19:34:40 +00:00
parent 3dfceb8b32
commit f07f82bd94
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/win32/FSNodeWin32.cxx
View File

@ -239,34 +239,16 @@ WindowsFilesystemNode::WindowsFilesystemNode()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
WindowsFilesystemNode::WindowsFilesystemNode(const string& p)
{
// Expand '~\' to the users 'home' directory
if (p.length() >= 2 && p[0] == '~' && p[1] == '\\')
{
_path = myHomeFinder.getHomePath();
// Skip over the tilde/dot. We know that p contains at least
// two chars, so this is safe:
_path += p.c_str() + 1;
}
// Expand '.\' to the current working directory,
// likewise if the path is relative (second character not a colon)
else if ((p.length() >= 2 && ((p[0] == '.' && p[1] == '\\') ||
p[1] != ':')))
{
char buf[4096];
if(GetCurrentDirectory(4096, buf) > 0)
_path = buf;
if(p[0] == '.')
// Skip over the tilde/dot. We know that p contains at least
// two chars, so this is safe:
_path = _path + (p.c_str() + 1);
else
_path = _path + '\\' + p;
}
else
{
// Expand '~' to the users 'home' directory
_path = p;
}
size_t home_pos = _path.find_first_of("~");
if(home_pos != string::npos)
_path.replace(home_pos, 1, myHomeFinder.getHomePath());
// Get absolute path
TCHAR buf[4096];
if(GetFullPathName(_path.c_str(), 4096, buf, NULL))
_path = buf;
_displayName = lastPathComponent(_path);