Merge pull request #569 from www220/fix-15-10-12-1

BernardXiong · BernardXiong · commit 6680a6b57ffa · 2015-10-14T10:32:54.000+08:00
[DFS] 修正romfs在输入的目录名称比实际的名称短时存在的判断错误
diff --git a/components/dfs/filesystems/romfs/dfs_romfs.c b/components/dfs/filesystems/romfs/dfs_romfs.c
@@ -96,7 +96,8 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch
 		{
             if (check_dirent(&dirent[index]) != 0)
                 return RT_NULL;
-			if (rt_strncmp(dirent[index].name, subpath, (subpath_end - subpath)) == 0)
+			if (rt_strlen(dirent[index].name) == (subpath_end - subpath) &&
+					rt_strncmp(dirent[index].name, subpath, (subpath_end - subpath)) == 0)
 			{
 				dirent_size = dirent[index].size;
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ struct romfs_dirent dfs_romfs_lookup(struct romfs_dirent root_dirent, const ch`
`96`	`96`	`{`
`97`	`97`	`if (check_dirent(&dirent[index]) != 0)`
`98`	`98`	`return RT_NULL;`
`99`		`- if (rt_strncmp(dirent[index].name, subpath, (subpath_end - subpath)) == 0)`
	`99`	`+ if (rt_strlen(dirent[index].name) == (subpath_end - subpath) &&`
	`100`	`+ rt_strncmp(dirent[index].name, subpath, (subpath_end - subpath)) == 0)`
`100`	`101`	`{`
`101`	`102`	`dirent_size = dirent[index].size;`
`102`	`103`