apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-18 17:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

nshlib: merge nsh_getdirpath() to nsh_fsutils.c

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2022-02-10 15:36:42 +08:00
committed by Xiang Xiao
parent ec15dc0344
commit d6a187efed
4 changed files with 59 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
nshlib/nsh_envcmds.c
View File

@@ -147,47 +147,6 @@ static inline FAR const char *nsh_getwd(const char *wd)
}
#endif
/****************************************************************************
* Name: nsh_getdirpath
****************************************************************************/
#ifndef CONFIG_DISABLE_ENVIRON
static inline char *nsh_getdirpath(FAR struct nsh_vtbl_s *vtbl,
const char *dirpath, const char *relpath)
{
FAR char *alloc;
int len;
/* Handle the special case where the dirpath is simply "/" */
if (strcmp(dirpath, "/") == 0)
{
len = strlen(relpath) + 2;
alloc = (FAR char *)malloc(len);
if (alloc)
{
sprintf(alloc, "/%s", relpath);
}
}
else
{
len = strlen(dirpath) + strlen(relpath) + 2;
alloc = (FAR char *)malloc(len);
if (alloc)
{
sprintf(alloc, "%s/%s", dirpath, relpath);
}
}
if (!alloc)
{
nsh_error(vtbl, g_fmtcmdoutofmemory, "nsh_getdirpath");
}
return alloc;
}
#endif
/****************************************************************************
* Name: nsh_dumpvar
****************************************************************************/