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

(svn r3061) - CodeChange: revert r3056, r3057 and add a simpler fix to satisfy the needs of the absolute strict (eg. root directory is C:\ not C:)

release/0.4.5
Darkvater 2005-10-18 20:18:05 +00:00
parent 8419473453
commit be984d9bcc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
win32.c
View File

@ -630,8 +630,9 @@ static HANDLE MyFindFirstFile(const char *path, const char *file, WIN32_FIND_DAT
UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS); // disable 'no-disk' message box UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS); // disable 'no-disk' message box
HANDLE h; HANDLE h;
char paths[MAX_PATH]; char paths[MAX_PATH];
const char *s = strrchr(path, '\\');
snprintf(paths, sizeof(paths), "%s\\%s", path, file); snprintf(paths, sizeof(paths), "%s%s%s", path, (s[1] == '\0') ? "" : "\\", file);
h = FindFirstFile(paths, fd); h = FindFirstFile(paths, fd);
SetErrorMode(sem); // restore previous setting SetErrorMode(sem); // restore previous setting
@ -671,7 +672,7 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
_fios_path = _fios_save_path; _fios_path = _fios_save_path;
// Parent directory, only if not of the type C:\. // Parent directory, only if not of the type C:\.
if (_fios_path[2] != '\0') { if (_fios_path[3] != '\0') {
fios = FiosAlloc(); fios = FiosAlloc();
fios->type = FIOS_TYPE_PARENT; fios->type = FIOS_TYPE_PARENT;
fios->mtime = 0; fios->mtime = 0;
@ -900,12 +901,15 @@ char *FiosBrowseTo(const FiosItem *item)
switch (item->type) { switch (item->type) {
case FIOS_TYPE_DRIVE: case FIOS_TYPE_DRIVE:
sprintf(path, "%c:", item->title[0]); sprintf(path, "%c:\\", item->title[0]);
break; break;
case FIOS_TYPE_PARENT: case FIOS_TYPE_PARENT:
s = strrchr(path, '\\'); s = strrchr(path, '\\');
s[0] = '\0'; if (s != path + 2)
s[0] = '\0';
else
s[1] = '\0';
break; break;
case FIOS_TYPE_DIR: case FIOS_TYPE_DIR: