kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: allow creating directories without homedir

Browse Source 
With this fix, ac can also create directories relative to the working
directory. This fixes xmaps for users without homedir set.
This commit is contained in:
ac-stef
2014-05-19 17:01:08 +02:00
parent 493aefd34b
commit 2768012579
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/stream.cpp
+14 -18
View File
@@ -217,26 +217,22 @@ void addpackagedir(const char *dir)
const char *findfile(const char *filename, const char *mode)
{
static string s;
if(homedir[0])
{
formatstring(s)("%s%s", homedir, filename);
if(fileexists(s, mode)) return s;
if(mode[0]=='w' || mode[0]=='a')
formatstring(s)("%s%s", homedir, filename); // homedir may be ""
if(fileexists(s, mode)) return s;
if(mode[0]=='w' || mode[0]=='a')
{ // create missing directories, if necessary
string dirs;
copystring(dirs, s);
char *dir = strchr(dirs[0]==PATHDIV ? dirs+1 : dirs, PATHDIV);
while(dir)
{
string dirs;
copystring(dirs, s);
char *dir = strchr(dirs[0]==PATHDIV ? dirs+1 : dirs, PATHDIV);
while(dir)
{
*dir = '\0';
if(!fileexists(dirs, "r") && !createdir(dirs)) return s;
*dir = PATHDIV;
dir = strchr(dir+1, PATHDIV);
}
return s;
*dir = '\0';
if(!fileexists(dirs, "r") && !createdir(dirs)) return s;
*dir = PATHDIV;
dir = strchr(dir+1, PATHDIV);
}
return s;
}
if(mode[0]=='w' || mode[0]=='a') return filename;
loopv(packagedirs)
{
formatstring(s)("%s%s", packagedirs[i], filename);
@@ -332,7 +328,7 @@ bool preparedir(const char *destination)
string dir;
copystring(dir, parentdir(destination));
vector<char *> dirs;
while(!fileexists(dir, "r"))
while(*dir && !fileexists(dir, "r"))
{
dirs.add(newstring(dir));
copystring(dir, parentdir(dir));