mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22668) -Codechange: FioFindFullPath tests already whether the file exists.

release/1.2
alberth 2011-07-16 18:34:04 +00:00
parent d209369c50
commit 20c2b5fdde
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fileio.cpp
View File

@ -300,6 +300,14 @@ char *FioGetFullPath(char *buf, size_t buflen, Searchpath sp, Subdirectory subdi
return buf; return buf;
} }
/**
* Find a path to the filename in one of the search directories.
* @param buf [out] Destination buffer for the path.
* @param buflen Length of the destination buffer.
* @param subdir Subdirectory to try.
* @param filename Filename to look for.
* @return \a buf containing the path if the path was found, else \c NULL.
*/
char *FioFindFullPath(char *buf, size_t buflen, Subdirectory subdir, const char *filename) char *FioFindFullPath(char *buf, size_t buflen, Subdirectory subdir, const char *filename)
{ {
Searchpath sp; Searchpath sp;
@ -307,17 +315,17 @@ char *FioFindFullPath(char *buf, size_t buflen, Subdirectory subdir, const char
FOR_ALL_SEARCHPATHS(sp) { FOR_ALL_SEARCHPATHS(sp) {
FioGetFullPath(buf, buflen, sp, subdir, filename); FioGetFullPath(buf, buflen, sp, subdir, filename);
if (FileExists(buf)) break; if (FileExists(buf)) return buf;
#if !defined(WIN32) #if !defined(WIN32)
/* Be, as opening files, aware that sometimes the filename /* Be, as opening files, aware that sometimes the filename
* might be in uppercase when it is in lowercase on the * might be in uppercase when it is in lowercase on the
* disk. Ofcourse Windows doesn't care about casing. */ * disk. Ofcourse Windows doesn't care about casing. */
strtolower(buf + strlen(_searchpaths[sp]) - 1); strtolower(buf + strlen(_searchpaths[sp]) - 1);
if (FileExists(buf)) break; if (FileExists(buf)) return buf;
#endif #endif
} }
return buf; return NULL;
} }
char *FioAppendDirectory(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir) char *FioAppendDirectory(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir)
@ -1049,9 +1057,7 @@ void DeterminePaths(const char *exe)
} }
} else { } else {
char personal_dir[MAX_PATH]; char personal_dir[MAX_PATH];
FioFindFullPath(personal_dir, lengthof(personal_dir), BASE_DIR, "openttd.cfg"); if (FioFindFullPath(personal_dir, lengthof(personal_dir), BASE_DIR, "openttd.cfg") != NULL) {
if (FileExists(personal_dir)) {
char *end = strrchr(personal_dir, PATHSEPCHAR); char *end = strrchr(personal_dir, PATHSEPCHAR);
if (end != NULL) end[1] = '\0'; if (end != NULL) end[1] = '\0';
_personal_dir = strdup(personal_dir); _personal_dir = strdup(personal_dir);