valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

fixed some filenames not being mangled, due to unsorted list access

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@642
This commit is contained in:
Ulf Wohlers 2003-01-19 14:08:22 +00:00
parent c5d18b9d98
commit bb1d5b2f2f
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dos/drive_cache.cpp
View file

@ -208,6 +208,7 @@ Bit16s DOS_Drive_Cache::GetLongName(CFileInfo* curDir, char* shortName)
Bit16s mid,res;
while (low<=high) {
mid = (low+high)/2;
CFileInfo* test = curDir->fileList[mid];
res = strcmp(shortName,curDir->fileList[mid]->shortname);
if (res>0) low = mid+1; else
if (res<0) high = mid-1; else
@ -221,27 +222,24 @@ Bit16s DOS_Drive_Cache::GetLongName(CFileInfo* curDir, char* shortName)
return -1;
};
Bit16s DOS_Drive_Cache::RemoveSpaces(char* str)
bool DOS_Drive_Cache::RemoveSpaces(char* str)
// Removes all spaces
// return length of string upto first '.'
{
char* curpos = str;
char* chkpos = str;
Bit16s len = -1;
while (*chkpos!=0) {
if (*chkpos=='.') { if (len<0) len = curpos - str; };
if (*chkpos==' ') chkpos++; else *curpos++ = *chkpos++;
}
*curpos = 0;
if (len<0) len = curpos - str;
return len;
return (curpos!=chkpos);
};
void DOS_Drive_Cache::CreateShortName(CFileInfo* curDir, CFileInfo* info)
{
Bit16s len = 0;
Bit16s lenExt = 0;
bool createShort = 0;
bool createShort = false;
char tmpNameBuffer[CROSS_LEN];
@ -249,7 +247,7 @@ void DOS_Drive_Cache::CreateShortName(CFileInfo* curDir, CFileInfo* info)
// Remove Spaces
strcpy(tmpName,info->fullname);
len = RemoveSpaces(tmpName);
createShort = RemoveSpaces(tmpName);
// Get Length of filename
char* pos = strchr(tmpName,'.');
@ -269,7 +267,7 @@ void DOS_Drive_Cache::CreateShortName(CFileInfo* curDir, CFileInfo* info)
len = strlen(tmpName);
// Should shortname version be created ?
if (!createShort) createShort = (len>8);
createShort = createShort || (len>8);
if (!createShort) {
char buffer[CROSS_LEN];
strcpy(buffer,tmpName);
@ -432,11 +430,12 @@ bool DOS_Drive_Cache::ReadDir(struct dirent* result)
struct dirent* tmpres;
while (tmpres = readdir(dirp)) {
CreateEntry(dirSearch,tmpres->d_name);
// Sort Lists - filelist has to be alphabetically sorted, even in between (for finding double file names)
// hmpf.. bit slow probably...
std::sort(dirSearch->fileList.begin(), dirSearch->fileList.end(), SortByName);
}
// close dir
closedir(dirp);
// Sort Lists - filelist has to be alphabetically sorted
std::sort(dirSearch->fileList.begin(), dirSearch->fileList.end(), SortByName);
// Output list - user defined
switch (sortDirType) {
case ALPHABETICAL : std::sort(dirSearch->outputList.begin(), dirSearch->outputList.end(), SortByName); break;

2
src/dos/drives.h
View file

@ -75,7 +75,7 @@ private:
bool SetResult (CFileInfo* dir, struct dirent* result, Bit16u entryNr);
bool IsCachedIn (CFileInfo* dir);
CFileInfo* FindDirInfo (const char* path, char* expandedPath);
Bit16s RemoveSpaces (char* str);
bool RemoveSpaces (char* str);
bool OpenDir (CFileInfo* dir, char* path);
void CreateEntry (CFileInfo* dir, const char* name);