From 726c787485b42d0bf94df313be9ce3d9ab10b6c5 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Thu, 26 Aug 2010 15:32:56 +0000 Subject: [PATCH] fix dfs_subdir issue. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@880 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/dfs/src/dfs.c | 3 +++ components/dfs/src/dfs_file.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index 28dcea0868..7d0d061b9a 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -228,6 +228,9 @@ const char* dfs_subdir(const char* directory, const char* filename) { const char* dir; + if (strlen(directory) == strlen(filename)) /* it's a same path */ + return RT_NULL; + dir = filename + strlen(directory); if ((*dir != '/') && (dir != filename)) { diff --git a/components/dfs/src/dfs_file.c b/components/dfs/src/dfs_file.c index 8450fee03c..f09a7c4a1c 100644 --- a/components/dfs/src/dfs_file.c +++ b/components/dfs/src/dfs_file.c @@ -61,7 +61,10 @@ int dfs_file_open(struct dfs_fd* fd, const char *path, int flags) fd->size = 0; fd->pos = 0; - fd->path = rt_strdup(dfs_subdir(fs->path, fullpath)); + if (dfs_subdir(fs->path, fullpath) == RT_NULL) + fd->path = rt_strdup("/"); + else + fd->path = rt_strdup(dfs_subdir(fs->path, fullpath)); rt_free(fullpath); dfs_log(DFS_DEBUG_INFO, ("actul file path: %s\n", fd->path)); @@ -224,7 +227,12 @@ int dfs_file_unlink(const char *path) } if (fs->ops->unlink != RT_NULL) - result = fs->ops->unlink(fs, dfs_subdir(fs->path, fullpath)); + { + if (dfs_subdir(fs->path, fullpath) == RT_NULL) + result = fs->ops->unlink(fs, "/"); + else + result = fs->ops->unlink(fs, dfs_subdir(fs->path, fullpath)); + } else result = -DFS_STATUS_ENOSYS; __exit: -- GitLab