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

nshlib: Tighten up some conditional logic

Browse Source
This commit is contained in:
Gregory Nutt
2017-10-26 16:07:42 -06:00
parent 40d9701ea0
commit 62f7838c5e
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nshlib/nsh_command.c
View File

@@ -171,7 +171,11 @@ static const struct cmdmap_s g_cmdmap[] =
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_DF)
#ifdef NSH_HAVE_CATFILE
#if defined(HAVE_DF_HUMANREADBLE) && defined(HAVE_DF_BLOCKOUTPUT)
{ "df", cmd_df, 1, 2, "[-h]" },
#else
{ "df", cmd_df, 1, 1, NULL },
#endif
#endif
#endif
@@ -339,8 +343,10 @@ static const struct cmdmap_s g_cmdmap[] =
#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE)
#ifndef CONFIG_NSH_DISABLE_MOUNT
#ifdef NSH_HAVE_CATFILE
#if defined(NSH_HAVE_CATFILE) && defined(HAVE_MOUNT_LIST)
{ "mount", cmd_mount, 1, 7, "[-t <fstype> [-o <options>] [<block-device>] <mount-point>]" },
#else
{ "mount", cmd_mount, 4, 7, "-t <fstype> [-o <options>] [<block-device>] <mount-point>" },
#endif
#endif
#endif