Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Merge pull request #10739 from hexfet/sdcard_name_clash

Browse source 
Fix name clashes in FAT filesystem
This commit is contained in:
Michael Keller 2021-05-18 01:34:42 +12:00 • committed by GitHub
commit f25642cc56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/io/asyncfatfs/asyncfatfs.c
View file

@ -2615,8 +2615,18 @@ static void afatfs_createFileContinue(afatfsFile_t *file)
opState->phase = AFATFS_CREATEFILE_PHASE_FAILURE; opState->phase = AFATFS_CREATEFILE_PHASE_FAILURE;
goto doMore; goto doMore;
} }
} else if (entry->attrib & FAT_FILE_ATTRIBUTE_VOLUME_ID) {
break;
} else if (strncmp(entry->filename, (char*) opState->filename, FAT_FILENAME_LENGTH) == 0) { } else if (strncmp(entry->filename, (char*) opState->filename, FAT_FILENAME_LENGTH) == 0) {
// We found a file with this name! // We found a file or directory with this name!
// Do not open file as dir or dir as file
if (((entry->attrib ^ file->attrib) & FAT_FILE_ATTRIBUTE_DIRECTORY) != 0) {
afatfs_findLast(&afatfs.currentDirectory);
opState->phase = AFATFS_CREATEFILE_PHASE_FAILURE;
goto doMore;
}
afatfs_fileLoadDirectoryEntry(file, entry); afatfs_fileLoadDirectoryEntry(file, entry);
afatfs_findLast(&afatfs.currentDirectory); afatfs_findLast(&afatfs.currentDirectory);