From 3d21a838218a7286c52a8ae54748128166bd1963 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Tue, 22 Nov 2011 22:32:56 +0000 Subject: [PATCH] fixed rename issue. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1798 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/dfs/filesystems/elmfat/dfs_elm.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c index 0489a0a814..455f6b2f3d 100644 --- a/components/dfs/filesystems/elmfat/dfs_elm.c +++ b/components/dfs/filesystems/elmfat/dfs_elm.c @@ -11,6 +11,7 @@ * Date Author Notes * 2008-02-22 QiuYi The first version. * 2011-10-08 Bernard fixed the block size in statfs. + * 2011-11-23 Bernard fixed the rename issue. */ #include @@ -535,7 +536,8 @@ int dfs_elm_rename(struct dfs_filesystem* fs, const char* oldpath, const char* n FRESULT result; #if _VOLUMES > 1 - char *drivers_oldfn, *drivers_newfn; + char *drivers_oldfn; + const char *drivers_newfn; int vol; extern int elm_get_vol(FATFS *fat); @@ -545,15 +547,9 @@ int dfs_elm_rename(struct dfs_filesystem* fs, const char* oldpath, const char* n drivers_oldfn = rt_malloc(256); if (drivers_oldfn == RT_NULL) return -DFS_STATUS_ENOMEM; - drivers_newfn = rt_malloc(256); - if (drivers_newfn == RT_NULL) - { - rt_free(drivers_oldfn); - return -DFS_STATUS_ENOMEM; - } + drivers_newfn = newpath; rt_snprintf(drivers_oldfn, 256, "%d:%s", vol, oldpath); - rt_snprintf(drivers_newfn, 256, "%d:%s", vol, newpath); #else const char *drivers_oldfn, *drivers_newfn; @@ -564,7 +560,6 @@ int dfs_elm_rename(struct dfs_filesystem* fs, const char* oldpath, const char* n result = f_rename(drivers_oldfn, drivers_newfn); #if _VOLUMES > 1 rt_free(drivers_oldfn); - rt_free(drivers_newfn); #endif return elm_result_to_dfs(result); } -- GitLab