Bladeren bron

fixup: merge condition

Shell 1 jaar geleden
bovenliggende
commit
91fc52df36
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      components/dfs/dfs_v1/src/dfs.c
  2. 1 1
      components/dfs/dfs_v2/src/dfs.c

+ 1 - 1
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 "/.." */

+ 1 - 1
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 "/.." */