nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

littlefs: fix EINVAL on path operations with littlefs 2.10.0

Browse source 
littlefs 2.10.0 and later rejects empty paths.  use "/" instead.

tested with esp32s3-devkit:toywasm.
This commit is contained in:
YAMAMOTO Takashi 2024-12-25 11:55:43 +09:00 committed by Alan C. Assis
parent b02a0758a7
commit a393f7fbd3
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/littlefs/lfs_vfs.c
View file

@ -308,6 +308,24 @@ static int littlefs_convert_oflags(int oflags)
return ret;
}
/****************************************************************************
* Name: littlefs_convert_path
****************************************************************************/
static FAR const char *littlefs_convert_path(FAR const char *path)
{
/* littlefs 2.10.0 and later rejects an empty path ("").
* use "/" instead.
*/
if (path[0] == '\0')
{
path = "/";
}
return path;
}
/****************************************************************************
* Name: littlefs_open
****************************************************************************/
@ -347,6 +365,7 @@ static int littlefs_open(FAR struct file *filep, FAR const char *relpath,
/* Try to open the file */
relpath = littlefs_convert_path(relpath);
oflags = littlefs_convert_oflags(oflags);
ret = littlefs_convert_result(lfs_file_open(&fs->lfs, &priv->file,
relpath, oflags));
@ -964,6 +983,7 @@ static int littlefs_opendir(FAR struct inode *mountpt,
/* Call the LFS's opendir function */
relpath = littlefs_convert_path(relpath);
ret = littlefs_convert_result(lfs_dir_open(&fs->lfs, &ldir->dir, relpath));
if (ret < 0)
{
@ -1506,6 +1526,7 @@ static int littlefs_unlink(FAR struct inode *mountpt,
return ret;
}
relpath = littlefs_convert_path(relpath);
ret = littlefs_convert_result(lfs_remove(&fs->lfs, relpath));
nxmutex_unlock(&fs->lock);
@ -1523,10 +1544,13 @@ static int littlefs_mkdir(FAR struct inode *mountpt, FAR const char *relpath,
mode_t mode)
{
FAR struct littlefs_mountpt_s *fs;
FAR char *path = (FAR char *)relpath;
FAR char *path;
size_t len = strlen(relpath);
int ret;
relpath = littlefs_convert_path(relpath);
path = (FAR char *)relpath;
/* We need remove all the '/' in the end of relpath */
if (len > 0 && relpath[len - 1] == '/')
@ -1601,6 +1625,7 @@ static int littlefs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
struct stat buf;
int ret;
relpath = littlefs_convert_path(relpath);
ret = littlefs_stat(mountpt, relpath, &buf);
if (ret < 0)
{
@ -1643,6 +1668,8 @@ static int littlefs_rename(FAR struct inode *mountpt,
return ret;
}
oldrelpath = littlefs_convert_path(oldrelpath);
newrelpath = littlefs_convert_path(newrelpath);
ret = littlefs_convert_result(lfs_rename(&fs->lfs, oldrelpath,
newrelpath));
nxmutex_unlock(&fs->lock);
@ -1679,6 +1706,7 @@ static int littlefs_stat(FAR struct inode *mountpt, FAR const char *relpath,
return ret;
}
relpath = littlefs_convert_path(relpath);
ret = lfs_stat(&fs->lfs, relpath, &info);
if (ret < 0)
{
@ -1749,6 +1777,7 @@ static int littlefs_chstat(FAR struct inode *mountpt,
return ret;
}
relpath = littlefs_convert_path(relpath);
ret = littlefs_convert_result(lfs_getattr(&fs->lfs, relpath, 0,
&attr, sizeof(attr)));
if (ret < 0)