From 91fc52df3635d5dda8285616420f08efa79cea04 Mon Sep 17 00:00:00 2001 From: Shell Date: Wed, 25 Oct 2023 15:11:32 +0800 Subject: [PATCH] fixup: merge condition --- components/dfs/dfs_v1/src/dfs.c | 2 +- components/dfs/dfs_v2/src/dfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/dfs/dfs_v1/src/dfs.c b/components/dfs/dfs_v1/src/dfs.c index 94bd8385cd..3db9a0bba2 100644 --- a/components/dfs/dfs_v1/src/dfs.c +++ b/components/dfs/dfs_v1/src/dfs.c @@ -759,7 +759,7 @@ up_one: /* remove '/' in the end of path if exist */ dst--; - if (dst >= fullpath && (dst != fullpath) && (*dst == '/')) + if (dst > fullpath && (*dst == '/')) *dst = '\0'; /* final check fullpath is not empty, for the special path of lwext "/.." */ diff --git a/components/dfs/dfs_v2/src/dfs.c b/components/dfs/dfs_v2/src/dfs.c index 62e5805d7a..d7a5eac002 100644 --- a/components/dfs/dfs_v2/src/dfs.c +++ b/components/dfs/dfs_v2/src/dfs.c @@ -668,7 +668,7 @@ char *dfs_normalize_path(const char *directory, const char *filename) /* remove '/' in the end of path if exist */ dst--; - if (dst >= fullpath && (dst != fullpath) && (*dst == '/')) + if (dst > fullpath && (*dst == '/')) *dst = '\0'; /* final check fullpath is not empty, for the special path of lwext "/.." */