fix directory search order

also clarify some log output
(thx grenadier)
This commit is contained in:
ac-stef
2014-09-21 21:19:03 +02:00
parent 075c53a6b0
commit 128e615ccc
+11 -10
View File
@@ -192,12 +192,11 @@ void sethomedir(const char *dir)
}
#endif
#ifndef STANDALONE
clientlogf("Using home directory: %s", tmpdir);
#endif
if(fixpackagedir(tmpdir) > 0)
{
#ifndef STANDALONE
clientlogf("Using home directory: %s", tmpdir);
#endif
copystring(homedir, tmpdir);
createdir(homedir);
}
@@ -205,20 +204,22 @@ void sethomedir(const char *dir)
void addpackagedir(const char *dir)
{
#ifndef STANDALONE
clientlogf("Adding package directory: %s", dir);
#endif
string pdir;
copystring(pdir, dir);
if(fixpackagedir(pdir) > 0) packagedirs.add(newstring(pdir));
if(fixpackagedir(pdir) > 0)
{
#ifndef STANDALONE
clientlogf("Adding package directory: %s", pdir);
#endif
packagedirs.add(newstring(pdir));
}
}
const char *findfile(const char *filename, const char *mode)
{
static string s;
formatstring(s)("%s%s", homedir, filename); // homedir may be ""
if(fileexists(s, mode)) return s;
if(homedir[0] && fileexists(s, mode)) return s;
if(mode[0]=='w' || mode[0]=='a')
{ // create missing directories, if necessary
string dirs;