diff options
| author | [email protected] <[email protected]> | 2012-11-14 15:53:54 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-11-14 15:53:54 +0000 |
| commit | 583bb26fb211555212a3fde10f49ea1264ada86d (patch) | |
| tree | e33e9ed4bc60f10e513350666f2a849b5b9d2920 /components/dfs | |
| parent | e57800785658cc8854791554ac59e8bd72c28628 (diff) | |
fix the bug about directory in uffs
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2412 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/dfs')
| -rw-r--r-- | components/dfs/filesystems/uffs/dfs_uffs.c | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/components/dfs/filesystems/uffs/dfs_uffs.c b/components/dfs/filesystems/uffs/dfs_uffs.c index 1ed433dfa2..d4997faa98 100644 --- a/components/dfs/filesystems/uffs/dfs_uffs.c +++ b/components/dfs/filesystems/uffs/dfs_uffs.c @@ -427,19 +427,44 @@ static int dfs_uffs_flush(struct dfs_fd* file) return 0;
}
+int uffs_seekdir(uffs_DIR *dir, long offset)
+{
+ int i = 0;
+
+ while(i < offset)
+ {
+ if (uffs_readdir(dir) == RT_NULL)
+ return -1;
+ i++;
+ }
+ return 0;
+}
+
+
static int dfs_uffs_seek(struct dfs_fd* file,
rt_off_t offset)
{
- int fd;
int result;
- fd = (int)(file->data);
-
/* set offset as current offset */
- result = uffs_seek(fd, offset, USEEK_SET);
- if (result < 0)
- return uffs_result_to_dfs(uffs_get_error());
- return result;
+ if (file->type == FT_DIRECTORY)
+ {
+ uffs_rewinddir((uffs_DIR *)(file->data));
+ result = uffs_seekdir((uffs_DIR *)(file->data), offset/sizeof(struct dirent));
+ if (result >= 0)
+ {
+ file->pos = offset;
+ return offset;
+ }
+ }
+ else if (file->type == FT_REGULAR)
+ {
+ result = uffs_seek((int)(file->data), offset, USEEK_SET);
+ if (result >= 0)
+ return offset;
+ }
+
+ return uffs_result_to_dfs(uffs_get_error());
}
/* return the size of struct dirent*/
@@ -519,6 +544,8 @@ static int dfs_uffs_getdents( if (index == 0)
return uffs_result_to_dfs(uffs_get_error());
+ file->pos += index * sizeof(struct dirent);
+
return index * sizeof(struct dirent);
}
|