Skip to content

[bugfix][component/dfs] fix bugs for function _get_parent_path(). #10539

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

Merged
merged 4 commits into from
Jul 31, 2025
Merged

[bugfix][component/dfs] fix bugs for function _get_parent_path(). #10539

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a538706
[bugfix][component/dfs]1.Skip the trailing slash character failed. 2.…
GorrayLi Jul 25, 2025
842d527
replace strdup() by rt_strdup().
GorrayLi Jul 25, 2025
54e300b
free memory after strdup().
GorrayLi Jul 25, 2025
5ca3dc4
fix issue of not appending '\0' at end when parent path is root.
GorrayLi Jul 29, 2025
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
35 changes: 25 additions & 10 deletions components/dfs/dfs_v2/src/dfs_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006-2023, RT-Thread Development Team
* Copyright (c) 2006-2025 RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down Expand Up @@ -50,24 +50,39 @@ static int _get_parent_path(const char *fullpath, char *path)
int len = 0;
char *str = 0;

str = strrchr(fullpath, '/');
char *full_path = rt_strdup(fullpath);
if (full_path == NULL)
{
rt_set_errno(ENOMEM);
return -1;
}

str = strrchr(full_path, '/');

/* skip last '/' */
if (str && *(str + 1) == '\0')
{
str = strrchr(str - 1, '/');
*str = '\0';
str = strrchr(full_path, '/');
}

if (str)
{
len = str - fullpath;
len = str - full_path;
if (len > 0)
{
rt_memcpy(path, fullpath, len);
rt_memcpy(path, full_path, len);
path[len] = '\0';
}
else if (len == 0) /* parent path is root path. */
{
path[0] = '/';
path[1] = '\0';
len = 1;
}
}

rt_free(full_path);
return len;
}

Expand Down Expand Up @@ -260,7 +275,7 @@ char *dfs_file_realpath(struct dfs_mnt **mnt, const char *fullpath, int mode)
{
int len, link_len;

path = (char *)rt_malloc((DFS_PATH_MAX * 3) + 3); // path + \0 + link_fn + \0 + tmp_path + \0
path = (char *)rt_malloc((DFS_PATH_MAX * 3) + 3); /* path + \0 + link_fn + \0 + tmp_path + \0 */
if (!path)
{
return RT_NULL;
Expand Down Expand Up @@ -2356,14 +2371,14 @@ void copy(const char *src, const char *dst)
flag |= FLAG_DST_IS_FILE;
}

//2. check status
/* 2. check status */
if ((flag & FLAG_SRC_IS_DIR) && (flag & FLAG_DST_IS_FILE))
{
rt_kprintf("cp faild, cp dir to file is not permitted!\n");
return ;
}

//3. do copy
/* 3. do copy */
if (flag & FLAG_SRC_IS_FILE)
{
if (flag & FLAG_DST_IS_DIR)
Expand All @@ -2383,7 +2398,7 @@ void copy(const char *src, const char *dst)
copyfile(src, dst);
}
}
else //flag & FLAG_SRC_IS_DIR
else /* flag & FLAG_SRC_IS_DIR */
{
if (flag & FLAG_DST_IS_DIR)
{
Expand Down Expand Up @@ -2411,4 +2426,4 @@ void copy(const char *src, const char *dst)
}
FINSH_FUNCTION_EXPORT(copy, copy file or dir)

#endif
#endif
Loading