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

Addressed review comments from @v01d and @xiaoxiang781216

Browse Source
This commit is contained in:
Subhra Sankha Sarkar 2020-10-28 15:34:16 +05:30 committed by Xiang Xiao
parent 0781dbf9e9
commit 23ec80fa30
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nshlib/nsh_fsutils.c
View File

@ -84,7 +84,18 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
fd = open(filepath, O_RDONLY);
if (fd < 0)
{
nsh_error(vtbl, g_fmtcmdfailed, cmd, "open", NSH_ERRNO);
if (strncmp(filepath, CONFIG_NSH_PROC_MOUNTPOINT,
strlen(CONFIG_NSH_PROC_MOUNTPOINT)) == 0)
{
nsh_error(vtbl,
"nsh: %s: Could not open %s (is procfs mounted?): %d\n",
cmd, filepath, NSH_ERRNO);
}
else
{
nsh_error(vtbl, g_fmtcmdfailed, cmd, "open", NSH_ERRNO);
}
return ERROR;
}
@ -319,7 +330,18 @@ int nsh_foreach_direntry(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
{
/* Failed to open the directory */
nsh_error(vtbl, g_fmtnosuch, cmd, "directory", dirpath);
if (strncmp(dirpath, CONFIG_NSH_PROC_MOUNTPOINT,
strlen(CONFIG_NSH_PROC_MOUNTPOINT)) == 0)
{
nsh_error(vtbl,
"nsh: %s: Could not open %s (is procfs mounted?): %d\n",
cmd, dirpath, NSH_ERRNO);
}
else
{
nsh_error(vtbl, g_fmtnosuch, cmd, "directory", dirpath);
}
return ERROR;
}

4
nshlib/nsh_netcmds.c
View File

@ -391,7 +391,9 @@ static int nsh_foreach_netdev(nsh_netdev_callback_t callback,
dir = opendir(CONFIG_NSH_PROC_MOUNTPOINT "/net");
if (dir == NULL)
{
nsh_error(vtbl, g_fmtcmdfailed, cmd, "opendir", NSH_ERRNO);
nsh_error(vtbl,
"nsh: %s: Could not open %s/net (is procfs mounted?): %d\n",
cmd, CONFIG_NSH_PROC_MOUNTPOINT, NSH_ERRNO);
return ERROR;
}