Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 16:59:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Soft link: Change how a value is returned so that _inode_linktarget will function in all of its use contexts.

Browse Source
This commit is contained in:
Gregory Nutt
2017-02-06 10:06:46 -06:00
parent 94e4d58fd2
commit 1b32cb67cb
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/inode/fs_inodesearch.c
+11 -21
View File
@@ -56,8 +56,7 @@
static int _inode_compare(FAR const char *fname, FAR struct inode *node); static int _inode_compare(FAR const char *fname, FAR struct inode *node);
#ifdef CONFIG_PSEUDOFS_SOFTLINKS #ifdef CONFIG_PSEUDOFS_SOFTLINKS
static int _inode_linktarget(FAR struct inode *node, static int _inode_linktarget(FAR struct inode *node,
FAR struct inode_search_s *desc, FAR struct inode_search_s *desc);
FAR const char **linktgt);
#endif #endif
static int _inode_search(FAR struct inode_search_s *desc); static int _inode_search(FAR struct inode_search_s *desc);
@@ -162,8 +161,7 @@ static int _inode_compare(FAR const char *fname, FAR struct inode *node)
#ifdef CONFIG_PSEUDOFS_SOFTLINKS #ifdef CONFIG_PSEUDOFS_SOFTLINKS
static int _inode_linktarget(FAR struct inode *node, static int _inode_linktarget(FAR struct inode *node,
FAR struct inode_search_s *desc, FAR struct inode_search_s *desc)
FAR const char **linktgt)
{ {
unsigned int count = 0; unsigned int count = 0;
bool save; bool save;
@@ -182,13 +180,6 @@ static int _inode_linktarget(FAR struct inode *node,
{ {
FAR const char *link = (FAR const char *)node->u.i_link; FAR const char *link = (FAR const char *)node->u.i_link;
/* Return the link target of the inode if the caller needs it. */
if (linktgt != NULL)
{
*linktgt = link;
}
/* Reset and reinitialize the search descriptor. */ /* Reset and reinitialize the search descriptor. */
RELEASE_SEARCH(desc); RELEASE_SEARCH(desc);
@@ -213,6 +204,8 @@ static int _inode_linktarget(FAR struct inode *node,
/* Set up for the next time through the loop */ /* Set up for the next time through the loop */
node = desc->node; node = desc->node;
DEBUGASSERT(node != NULL);
desc->linktgt = link;
} }
desc->nofollow = save; desc->nofollow = save;
@@ -341,7 +334,7 @@ static int _inode_search(FAR struct inode_search_s *desc)
* link, and (3) continue searching with that inode instead. * link, and (3) continue searching with that inode instead.
*/ */
status = _inode_linktarget(node, desc, NULL); status = _inode_linktarget(node, desc);
if (status < 0) if (status < 0)
{ {
/* Probably means that the the target of the symbolic /* Probably means that the the target of the symbolic
@@ -366,11 +359,10 @@ static int _inode_search(FAR struct inode_search_s *desc)
if (INODE_IS_MOUNTPT(newnode)) if (INODE_IS_MOUNTPT(newnode))
{ {
/* Yes.. return the path to the link target */ /* Return the mountpoint information.
* NOTE that the last path to the link target
desc->linktgt = node->u.i_link; * was already set by _inode_linktarget().
*/
/* Return the mountpoint information. */
node = newnode; node = newnode;
above = NULL; above = NULL;
@@ -483,7 +475,6 @@ int inode_search(FAR struct inode_search_s *desc)
*/ */
FAR const char *relpath = desc->relpath; /* Will always be "" here */ FAR const char *relpath = desc->relpath; /* Will always be "" here */
FAR const char *link = NULL;
/* The terminating inode is a valid soft link: Return the inode, /* The terminating inode is a valid soft link: Return the inode,
* corresponding to link target. _inode_linktarget() will follow * corresponding to link target. _inode_linktarget() will follow
@@ -491,7 +482,7 @@ int inode_search(FAR struct inode_search_s *desc)
* link target of the final symbolic link in the series. * link target of the final symbolic link in the series.
*/ */
ret = _inode_linktarget(node, desc, &link); ret = _inode_linktarget(node, desc);
if (ret < 0) if (ret < 0)
{ {
/* The most likely cause for failure is that the target of the /* The most likely cause for failure is that the target of the
@@ -504,14 +495,13 @@ int inode_search(FAR struct inode_search_s *desc)
/* The dereferenced node might be a mountpoint */ /* The dereferenced node might be a mountpoint */
node = desc->node; node = desc->node;
DEBUGASSERT(node != NULL && link != NULL); DEBUGASSERT(node != NULL && desc->linktgt != NULL);
if (INODE_IS_MOUNTPT(node)) if (INODE_IS_MOUNTPT(node))
{ {
/* Yes... set up for the MOUNTPOINT logic below. */ /* Yes... set up for the MOUNTPOINT logic below. */
desc->relpath = relpath; desc->relpath = relpath;
desc->linktgt = link;
} }
} }