D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-20 06:43:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check for ldc.conf next to the ldc binary before home and etc.

Browse Source 
The new search order is
 * current working directory
 * next to executable
 * user home directory
 * prefix/etc
 * prefix/etc/ldc
 * /etc
 * /etc/ldc
This commit is contained in:
Christian Kamm
2009-07-13 22:24:12 +02:00
parent 0ee2f34611
commit 919f8d6bfa
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gen/configfile.cpp
View File

@@ -26,19 +26,26 @@ ConfigFile::~ConfigFile()
bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const char* filename) bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const char* filename)
{ {
// 1) try the current working dir // try the current working dir
p = sys::Path::GetCurrentDirectory(); p = sys::Path::GetCurrentDirectory();
p.appendComponent(filename); p.appendComponent(filename);
if (p.exists()) if (p.exists())
return true; return true;
// 2) try the user home dir // try next to the executable
p = sys::Path::GetMainExecutable(argv0, mainAddr);
p.eraseComponent();
p.appendComponent(filename);
if (p.exists())
return true;
// try the user home dir
p = sys::Path::GetUserHomeDirectory(); p = sys::Path::GetUserHomeDirectory();
p.appendComponent(filename); p.appendComponent(filename);
if (p.exists()) if (p.exists())
return true; return true;
// 3) try the install-prefix/etc // try the install-prefix/etc
p = sys::Path(LDC_INSTALL_PREFIX); p = sys::Path(LDC_INSTALL_PREFIX);
#if !_WIN32 #if !_WIN32
// Does Windows need something similar? // Does Windows need something similar?
@@ -51,7 +58,7 @@ bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const c
#if !_WIN32 #if !_WIN32
// Does Windows need something similar to these? // Does Windows need something similar to these?
// 4) try the install-prefix/etc/ldc // try the install-prefix/etc/ldc
p = sys::Path(LDC_INSTALL_PREFIX); p = sys::Path(LDC_INSTALL_PREFIX);
p.appendComponent("etc"); p.appendComponent("etc");
p.appendComponent("ldc"); p.appendComponent("ldc");
@@ -59,26 +66,19 @@ bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const c
if (p.exists()) if (p.exists())
return true; return true;
// 5) try /etc (absolute path) // try /etc (absolute path)
p = sys::Path("/etc"); p = sys::Path("/etc");
p.appendComponent(filename); p.appendComponent(filename);
if (p.exists()) if (p.exists())
return true; return true;
// 6) try /etc/ldc (absolute path) // try /etc/ldc (absolute path)
p = sys::Path("/etc/ldc"); p = sys::Path("/etc/ldc");
p.appendComponent(filename); p.appendComponent(filename);
if (p.exists()) if (p.exists())
return true; return true;
#endif #endif
// 7) try next to the executable
p = sys::Path::GetMainExecutable(argv0, mainAddr);
p.eraseComponent();
p.appendComponent(filename);
if (p.exists())
return true;
return false; return false;
} }