chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DFS] Fix the fd clear issue.

This commit is contained in:
Bernard Xiong 2015-06-04 22:23:53 +08:00
parent 951fd5429c
commit c6d4407c57
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/dfs/src/dfs_file.c
View File

@ -21,6 +21,7 @@
* Date Author Notes * Date Author Notes
* 2005-02-22 Bernard The first version. * 2005-02-22 Bernard The first version.
* 2011-12-08 Bernard Merges rename patch from iamcacy. * 2011-12-08 Bernard Merges rename patch from iamcacy.
* 2015-05-27 Bernard Fix the fd clear issue.
*/ */
#include <dfs.h> #include <dfs.h>
@ -97,7 +98,7 @@ int dfs_file_open(struct dfs_fd *fd, const char *path, int flags)
{ {
/* clear fd */ /* clear fd */
rt_free(fd->path); rt_free(fd->path);
rt_memset(fd, 0, sizeof(*fd)); fd->path = RT_NULL;
return -DFS_STATUS_ENOSYS; return -DFS_STATUS_ENOSYS;
} }
@ -106,7 +107,7 @@ int dfs_file_open(struct dfs_fd *fd, const char *path, int flags)
{ {
/* clear fd */ /* clear fd */
rt_free(fd->path); rt_free(fd->path);
rt_memset(fd, 0, sizeof(*fd)); fd->path = RT_NULL;
dfs_log(DFS_DEBUG_INFO, ("open failed")); dfs_log(DFS_DEBUG_INFO, ("open failed"));
@ -143,7 +144,7 @@ int dfs_file_close(struct dfs_fd *fd)
return result; return result;
rt_free(fd->path); rt_free(fd->path);
rt_memset(fd, 0, sizeof(struct dfs_fd)); fd->path = RT_NULL;
return result; return result;
} }
@ -632,15 +633,15 @@ static void copyfile(const char *src, const char *dst)
read_bytes = dfs_file_read(&src_fd, block_ptr, BUF_SZ); read_bytes = dfs_file_read(&src_fd, block_ptr, BUF_SZ);
if (read_bytes > 0) if (read_bytes > 0)
{ {
int length; int length;
length = dfs_file_write(&fd, block_ptr, read_bytes); length = dfs_file_write(&fd, block_ptr, read_bytes);
if (length != read_bytes) if (length != read_bytes)
{ {
/* write failed. */ /* write failed. */
rt_kprintf("Write file data failed, errno=%d\n", length); rt_kprintf("Write file data failed, errno=%d\n", length);
break; break;
} }
} }
} while (read_bytes > 0); } while (read_bytes > 0);
@ -652,7 +653,6 @@ static void copyfile(const char *src, const char *dst)
extern int mkdir(const char *path, mode_t mode); extern int mkdir(const char *path, mode_t mode);
static void copydir(const char * src, const char * dst) static void copydir(const char * src, const char * dst)
{ {
struct dfs_fd fd;
struct dirent dirent; struct dirent dirent;
struct stat stat; struct stat stat;
int length; int length;