dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-01-14 23:22:47 +00:00
parent 3dbf09888a 0842742b91
commit 4a0d949d83
41 changed files with 306 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/fileio.cpp
View File

@@ -584,32 +584,6 @@ bool AppendPathSeparator(char *buf, const char *last)
return true;
}
/**
* Allocates and files a variable with the full path
* based on the given directory.
* @param dir the directory to base the path on
* @return the malloced full path
*/
char *BuildWithFullPath(const char *dir)
{
char *dest = MallocT<char>(MAX_PATH);
char *last = dest + MAX_PATH - 1;
strecpy(dest, dir, last);
/* Check if absolute or relative path */
const char *s = strchr(dest, PATHSEPCHAR);
/* Add absolute path */
if (s == NULL || dest != s) {
if (getcwd(dest, MAX_PATH) == NULL) *dest = '\0';
AppendPathSeparator(dest, last);
strecat(dest, dir, last);
}
AppendPathSeparator(dest, last);
return dest;
}
/**
* Find the first directory in a tar archive.
* @param tarname the name of the tar archive to look in.