Skip to content

Fix empty directory checks with wildcard find API #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Old-Ding wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix empty directory checks with wildcard find API #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion ff_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,14 +512,55 @@ static FF_FILE * prvAllocFileHandle( FF_IOManager_t * pxIOManager,
FF_DirEnt_t xDirEntry;
FF_Error_t xError = FF_ERR_NONE;
BaseType_t xReturn;
uint32_t ulDirCluster;
uint16_t usPathLength;

if( pxIOManager == NULL )
{
xReturn = pdFALSE;
}
else
{
xError = FF_FindFirst( pxIOManager, &xDirEntry, pcPath );
memset( &xDirEntry, 0, sizeof( xDirEntry ) );

#if ( ffconfigUNICODE_UTF16_SUPPORT != 0 )
usPathLength = ( uint16_t ) wcslen( pcPath );
#else
usPathLength = ( uint16_t ) strlen( pcPath );
#endif

#if ( ffconfigREMOVABLE_MEDIA != 0 )
if( ( pxIOManager->ucFlags & FF_IOMAN_DEVICE_IS_EXTRACTED ) != 0 )
{
xError = FF_createERR( FF_ERR_IOMAN_DRIVER_NOMEDIUM, FF_ISDIREMPTY );
}
else
#endif /* ffconfigREMOVABLE_MEDIA */
{
/* FF_isDirEmpty() must enumerate the directory contents. Calling
* FF_FindFirst() would let wildcard mode reinterpret a path without
* a trailing separator as the directory entry itself. */
ulDirCluster = FF_FindDir( pxIOManager, pcPath, usPathLength, &xError );

if( FF_isERR( xError ) == pdFALSE )
{
if( ulDirCluster == 0UL )
{
xError = FF_createERR( FF_ERR_DIR_INVALID_PATH, FF_ISDIREMPTY );
}
else
{
xDirEntry.ulDirCluster = ulDirCluster;
xError = FF_InitEntryFetch( pxIOManager, ulDirCluster, &( xDirEntry.xFetchContext ) );

if( FF_isERR( xError ) == pdFALSE )
{
xDirEntry.usCurrentItem = 0;
xError = FF_FindNext( pxIOManager, &xDirEntry );
}
}
}
}

/* Assume the directory is empty until a file is
* encountered with a name other than ".." or "." */
Expand Down