summaryrefslogtreecommitdiff
path: root/apps/nshlib/nsh_command.c
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-02-20 18:14:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-02-20 18:14:02 -0600
commitfd56877c0a3a22fa5218dfa3df2799c914e17162 (patch)
tree5e191d2f3628c5fa8963e4539a3a2502c56af583 /apps/nshlib/nsh_command.c
parent0d7693fca4ccbf8a4093194f0876c1baf6173956 (diff)
downloadpx4-nuttx-fd56877c0a3a22fa5218dfa3df2799c914e17162.tar.gz
px4-nuttx-fd56877c0a3a22fa5218dfa3df2799c914e17162.tar.bz2
px4-nuttx-fd56877c0a3a22fa5218dfa3df2799c914e17162.zip
unlink/rm can now be used on nodes in the pseudo-filesystem. There is new configuration option to suppress these costly and mostly useless operations on the pseudo-filesystem
Diffstat (limited to 'apps/nshlib/nsh_command.c')
-rw-r--r--apps/nshlib/nsh_command.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/nshlib/nsh_command.c b/apps/nshlib/nsh_command.c
index a52a91d4a..2c043aa5c 100644
--- a/apps/nshlib/nsh_command.c
+++ b/apps/nshlib/nsh_command.c
@@ -121,7 +121,7 @@ static const struct cmdmap_s g_cmdmap[] =
#if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_LOOPS)
{ "break", cmd_break, 1, 1, NULL },
-#endif
+#endif
#if CONFIG_NFILE_DESCRIPTORS > 0
# ifndef CONFIG_NSH_DISABLE_CAT
@@ -252,7 +252,7 @@ static const struct cmdmap_s g_cmdmap[] =
# endif
#endif
-#if CONFIG_NFILE_DESCRIPTORS > 0
+#ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_MKDIR
{ "mkdir", cmd_mkdir, 2, 2, "<path>" },
# endif
@@ -270,7 +270,7 @@ static const struct cmdmap_s g_cmdmap[] =
# endif
#endif
-#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE)
+#ifdef NSH_HAVE_WRITABLE_MOUNTPOINT
# ifndef CONFIG_NSH_DISABLE_MKRD
{ "mkrd", cmd_mkrd, 2, 6, "[-m <minor>] [-s <sector-size>] <nsectors>" },
# endif
@@ -300,7 +300,7 @@ static const struct cmdmap_s g_cmdmap[] =
# endif
#endif
-#if CONFIG_NFILE_DESCRIPTORS > 0
+#ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_MV
{ "mv", cmd_mv, 3, 3, "<old-path> <new-path>" },
# endif
@@ -340,13 +340,13 @@ static const struct cmdmap_s g_cmdmap[] =
# endif
#endif
-#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE)
+#ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_RM
{ "rm", cmd_rm, 2, 2, "<file-path>" },
# endif
-# endif
+#endif
-#if CONFIG_NFILE_DESCRIPTORS > 0
+#ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_RMDIR
{ "rmdir", cmd_rmdir, 2, 2, "<dir-path>" },
# endif