gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

fix handling of non-CP1252 characters in paths

Browse Source 
(added wide-character versions of posix opendir etc. - on Windows, we
must not convert to UTF8)

This was SVN commit r7243.
This commit is contained in:
janwas
2010-01-05 19:44:30 +00:00
parent 33ab686128
commit 97db62c944
17 changed files with 452 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/GameSetup/Paths.cpp
+6 -5
View File
@@ -20,6 +20,7 @@
#include "lib/path_util.h"
#include "lib/wchar.h"
#include "lib/sysdep/filesystem.h" // wrealpath
#include "lib/sysdep/sysdep.h" // sys_get_executable_name
#if OS_WIN
# include "lib/sysdep/os/win/wutil.h" // wutil_AppdataPath
@@ -28,7 +29,7 @@
Paths::Paths(const CmdLineArgs& args)
{
m_root = Root(args.GetArg0());
m_root = Root(wstring_from_utf8(args.GetArg0()));
m_rdata = m_root/L"data/";
const wchar_t* subdirectoryName = args.Has("writableRoot")? 0 : L"0ad";
@@ -61,7 +62,7 @@ Paths::Paths(const CmdLineArgs& args)
}
/*static*/ fs::wpath Paths::Root(const CStr& argv0)
/*static*/ fs::wpath Paths::Root(const std::wstring& argv0)
{
// get full path to executable
fs::wpath pathname;
@@ -69,11 +70,11 @@ Paths::Paths(const CmdLineArgs& args)
if(sys_get_executable_name(pathname) != INFO::OK)
{
// .. failed; use argv[0]
char pathname_c[PATH_MAX];
wchar_t pathname_buf[PATH_MAX];
errno = 0;
if(!realpath(argv0.c_str(), pathname_c))
if(!wrealpath(argv0.c_str(), pathname_buf))
WARN_ERR(LibError_from_errno(false));
pathname = wpath_from_path(pathname_c);
pathname = pathname_buf;
}
// make sure it's valid