c64/pi1541
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed Issue #32: Confusing similar name files.

Browse source
This commit is contained in:
Stephen White 2018-07-02 18:55:54 +10:00
parent e4dc6e54ec
commit d2b87e609a
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/iec_commands.cpp
View file

@ -1466,23 +1466,26 @@ bool IEC_Commands::FindFirst(DIR& dir, const char* matchstr, FILINFO& filInfo)
// SOMELONGDISKIMAGENAME.D64 to SOMELONGDISKIMAGENAME*.D64 // SOMELONGDISKIMAGENAME.D64 to SOMELONGDISKIMAGENAME*.D64
// so the actual SOMELONGDISKIMAGENAMETHATISWAYTOOLONGFORCBMFILEBROWSERTODISPLAY.D64 will be found. // so the actual SOMELONGDISKIMAGENAMETHATISWAYTOOLONGFORCBMFILEBROWSERTODISPLAY.D64 will be found.
strcpy(pattern, matchstr); strcpy(pattern, matchstr);
char* ext = strrchr(matchstr, '.'); if (strlen(pattern) > 12)
if (ext)
{ {
char* ptr = strrchr(pattern, '.'); char* ext = strrchr(matchstr, '.');
*ptr++ = '*'; if (ext)
for (int i = 0; i < 4; i++)
{ {
*ptr++ = *ext++; char* ptr = strrchr(pattern, '.');
*ptr++ = '*';
for (int i = 0; i < 4; i++)
{
*ptr++ = *ext++;
}
*ptr = 0;
}
else
{
// For folders we do the same except we need to change the last character to a *
int len = strlen(matchstr);
if (len >= CBM_NAME_LENGTH)
pattern[CBM_NAME_LENGTH - 1] = '*';
} }
*ptr = 0;
}
else
{
// For folders we do the same except we need to change the last character to a *
int len = strlen(matchstr);
if (len >= CBM_NAME_LENGTH)
pattern[CBM_NAME_LENGTH - 1] = '*';
} }
//DEBUG_LOG("Pattern %s -> %s\r\n", matchstr, pattern); //DEBUG_LOG("Pattern %s -> %s\r\n", matchstr, pattern);
res = f_findfirst(&dir, &filInfo, ".", (const TCHAR*)pattern); res = f_findfirst(&dir, &filInfo, ".", (const TCHAR*)pattern);