mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-16 16:20:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fixbuild' into 'master'

Browse Source 
Use pathconf() to determine the maximum path length

See merge request OpenMW/openmw!134
This commit is contained in:
Alexei Dobrohotov 2019-07-07 12:53:08 +00:00
commit 010cd4987d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/files/linuxpath.cpp
View File

@ -4,7 +4,6 @@
#include <pwd.h>
#include <unistd.h>
#include <linux/limits.h>
#include <boost/filesystem/fstream.hpp>
#include <components/debug/debuglog.hpp>
@ -81,13 +80,12 @@ boost::filesystem::path LinuxPath::getGlobalConfigPath() const
boost::filesystem::path LinuxPath::getLocalPath() const
{
boost::filesystem::path localPath("./");
char binPath[PATH_MAX];
memset(binPath, 0, sizeof(binPath));
std::string binPath(pathconf(".", _PC_PATH_MAX), '\0');
const char *statusPaths[] = {"/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file"};
for(const char *path : statusPaths)
{
if (readlink(path, binPath, sizeof(binPath)) != -1)
if (readlink(path, &binPath[0], binPath.size()) != -1)
{
localPath = boost::filesystem::path(binPath).parent_path();
break;