libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-21 00:27:19 +08:00
Code Issues Releases Wiki Activity

fixup: merge condition

Browse Source
This commit is contained in:
Shell 2023-10-25 15:11:32 +08:00 committed by guo
parent e94b759160
commit 91fc52df36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/dfs/dfs_v1/src/dfs.c
View File

@ -759,7 +759,7 @@ up_one:
/* remove '/' in the end of path if exist */ /* remove '/' in the end of path if exist */
dst--; dst--;
if (dst >= fullpath && (dst != fullpath) && (*dst == '/')) if (dst > fullpath && (*dst == '/'))
*dst = '\0'; *dst = '\0';
/* final check fullpath is not empty, for the special path of lwext "/.." */ /* final check fullpath is not empty, for the special path of lwext "/.." */

2
components/dfs/dfs_v2/src/dfs.c
View File

@ -668,7 +668,7 @@ char *dfs_normalize_path(const char *directory, const char *filename)
/* remove '/' in the end of path if exist */ /* remove '/' in the end of path if exist */
dst--; dst--;
if (dst >= fullpath && (dst != fullpath) && (*dst == '/')) if (dst > fullpath && (*dst == '/'))
*dst = '\0'; *dst = '\0';
/* final check fullpath is not empty, for the special path of lwext "/.." */ /* final check fullpath is not empty, for the special path of lwext "/.." */