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

apps/nshlib: Correct error introduced to conditional compilation

Browse Source
This commit is contained in:
Gregory Nutt 2017-11-14 08:42:16 -06:00
parent e37f4b7004
commit 626f41084b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nshlib/nsh.h
View File

@ -684,12 +684,13 @@
# undef NSH_HAVE_TRIMDIR # undef NSH_HAVE_TRIMDIR
#endif #endif
/* nsh_catfile used by cat, ifconfig, ifup/down, df, free, and mount */ /* nsh_catfile used by cat, ifconfig, ifup/down, df, free, and mount (with
* no arguments).
*/
#if !defined(CONFIG_NSH_DISABLE_CAT) && !defined(CONFIG_NSH_DISABLE_IFCONFIG) && \ #if !defined(CONFIG_NSH_DISABLE_CAT) && !defined(CONFIG_NSH_DISABLE_IFCONFIG) && \
!defined(CONFIG_NSH_DISABLE_IFUPDOWN) && !defined(CONFIG_NSH_DISABLE_DF) && \ !defined(CONFIG_NSH_DISABLE_IFUPDOWN) && !defined(CONFIG_NSH_DISABLE_DF) && \
!defined(CONFIG_NSH_DISABLE_FREE) && \ !defined(CONFIG_NSH_DISABLE_FREE) && !defined(HAVE_MOUNT_LIST)
(!defined(CONFIG_NSH_DISABLE_MOUNT) || !defined(HAVE_MOUNT_LIST))
# undef NSH_HAVE_CATFILE # undef NSH_HAVE_CATFILE
#endif #endif

6
nshlib/nsh_mmcmds.c
View File

@ -42,6 +42,8 @@
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"
#if !defined(CONFIG_NSH_DISABLE_FREE) && defined(NSH_HAVE_CATFILE)
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -50,9 +52,9 @@
* Name: cmd_free * Name: cmd_free
****************************************************************************/ ****************************************************************************/
#if !defined(CONFIG_NSH_DISABLE_FREE) && defined(NSH_HAVE_CATFILE)
int cmd_free(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) int cmd_free(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
{ {
return nsh_catfile(vtbl, argv[0], CONFIG_NSH_PROC_MOUNTPOINT "/meminfo"); return nsh_catfile(vtbl, argv[0], CONFIG_NSH_PROC_MOUNTPOINT "/meminfo");
} }
#endif /* !CONFIG_NSH_DISABLE_FREE */
#endif /* !CONFIG_NSH_DISABLE_FREE && NSH_HAVE_CATFILE */