sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/romfs: fix bug about test:examples/romfs

Browse Source 
Mounting ROMFS filesystem at target=/usr/local/share with source=/dev/ram1
Traversing directory: /usr/local/share
  DIRECTORY: /usr/local/share/adir/
Traversing directory: /usr/local/share/adir
  FILE: /usr/local/share/adir/anotherfile.txt/
  DIRECTORY: /usr/local/share/adir/subdir/
Traversing directory: /usr/local/share/adir/subdir
  FILE: /usr/local/share/adir/subdir/subdirfile.txt/
Continuing directory: /usr/local/share/adir
  FILE: /usr/local/share/adir/yafile.txt/
Continuing directory: /usr/local/share
  FILE: /usr/local/share/afile.txt/
  FILE: /usr/local/share/hfile/
ERROR: ldir never found
Finished with  1 errors

Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2022-03-10 21:43:51 +08:00 committed by Petro Karashchenko
parent 0d365f6fb9
commit a721bc8830
1 changed files with 58 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
fs/romfs/fs_romfsutil.c
View File

@ -108,44 +108,37 @@ static inline int romfs_checkentry(FAR struct romfs_mountpt_s *rm,
return ret; return ret;
} }
/* Now we are pointing to the real entry of interest. Is it a /* Get the name of the directory entry. */
* directory? Or a file?
ret = romfs_parsefilename(rm, offset, name);
if (ret < 0)
{
return ret;
}
/* Then check if this the name segment we are looking for. The
* string comparison is awkward because there is no terminator
* on entryname (there is a terminator on name, however)
*/ */
if (IS_DIRECTORY(next) || IS_FILE(next)) if (strlen(name) == entrylen &&
memcmp(entryname, name, entrylen) == 0)
{ {
/* Get the name of the directory entry. */ /* Found it -- save the component info and return success */
ret = romfs_parsefilename(rm, offset, name); if (IS_DIRECTORY(next))
if (ret < 0)
{ {
return ret; nodeinfo->rn_offset = info;
nodeinfo->rn_size = 0;
}
else
{
nodeinfo->rn_offset = linkoffset;
nodeinfo->rn_size = size;
} }
/* Then check if this the name segment we are looking for. The nodeinfo->rn_next = next;
* string comparison is awkward because there is no terminator return OK;
* on entryname (there is a terminator on name, however)
*/
if (memcmp(entryname, name, entrylen) == 0 &&
strlen(name) == entrylen)
{
/* Found it -- save the component info and return success */
if (IS_DIRECTORY(next))
{
nodeinfo->rn_offset = info;
nodeinfo->rn_size = 0;
}
else
{
nodeinfo->rn_offset = linkoffset;
nodeinfo->rn_size = size;
}
nodeinfo->rn_next = next;
return OK;
}
} }
/* The entry is not a directory or it does not have the matching name */ /* The entry is not a directory or it does not have the matching name */
@ -321,7 +314,7 @@ static inline int romfs_searchdir(FAR struct romfs_mountpt_s *rm,
FAR struct romfs_nodeinfo_s **cnodeinfo; FAR struct romfs_nodeinfo_s **cnodeinfo;
cnodeinfo = bsearch(entryname, nodeinfo->rn_child, nodeinfo->rn_count, cnodeinfo = bsearch(entryname, nodeinfo->rn_child, nodeinfo->rn_count,
sizeof(FAR struct romfs_nodeinfo_s *), sizeof(struct romfs_nodeinfo_s *),
romfs_nodeinfo_search); romfs_nodeinfo_search);
if (cnodeinfo) if (cnodeinfo)
{ {
@ -436,51 +429,44 @@ static int romfs_cachenode(FAR struct romfs_mountpt_s *rm,
return ret; return ret;
} }
/* Now we are pointing to the real entry of interest. Is it a ret = romfs_parsefilename(rm, offset, childname);
* directory? Or a file? if (ret < 0)
*/
if (IS_DIRECTORY(next) || IS_FILE(next))
{ {
ret = romfs_parsefilename(rm, offset, childname); return ret;
if (ret < 0) }
if (strcmp(childname, ".") != 0 && strcmp(childname, "..") != 0)
{
if (child == NULL || nodeinfo->rn_count == num - 1)
{ {
return ret; FAR void *tmp;
tmp = kmm_realloc(nodeinfo->rn_child,
(num + NODEINFO_NINCR) *
sizeof(struct romfs_nodeinfo_s *));
if (tmp == NULL)
{
return -ENOMEM;
}
nodeinfo->rn_child = tmp;
memset(nodeinfo->rn_child + num, 0, NODEINFO_NINCR *
sizeof(struct romfs_nodeinfo_s *));
num += NODEINFO_NINCR;
} }
if (strcmp(childname, ".") != 0 && strcmp(childname, "..") != 0) child = &nodeinfo->rn_child[nodeinfo->rn_count++];
if (IS_DIRECTORY(next))
{ {
if (child == NULL || nodeinfo->rn_count == num - 1) linkoffset = info;
{ }
FAR void *tmp;
tmp = kmm_realloc(nodeinfo->rn_child, ret = romfs_cachenode(rm, linkoffset, next, size,
(num + NODEINFO_NINCR) * childname, child);
sizeof(FAR struct romfs_nodeinfo_s *)); if (ret < 0)
if (tmp == NULL) {
{ nodeinfo->rn_count--;
return -ENOMEM; return ret;
}
nodeinfo->rn_child = tmp;
memset(nodeinfo->rn_child + num, 0, NODEINFO_NINCR *
sizeof(FAR struct romfs_nodeinfo_s *));
num += NODEINFO_NINCR;
}
child = &nodeinfo->rn_child[nodeinfo->rn_count++];
if (IS_DIRECTORY(next))
{
linkoffset = info;
}
ret = romfs_cachenode(rm, linkoffset, next, size,
childname, child);
if (ret < 0)
{
nodeinfo->rn_count--;
return ret;
}
} }
} }
@ -492,7 +478,7 @@ static int romfs_cachenode(FAR struct romfs_mountpt_s *rm,
if (nodeinfo->rn_count > 1) if (nodeinfo->rn_count > 1)
{ {
qsort(nodeinfo->rn_child, nodeinfo->rn_count, qsort(nodeinfo->rn_child, nodeinfo->rn_count,
sizeof(FAR struct romfs_nodeinfo_s *), sizeof(struct romfs_nodeinfo_s *),
romfs_nodeinfo_compare); romfs_nodeinfo_compare);
} }