diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-19 13:14:39 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-19 13:14:39 -0600 |
| commit | d4352a177b3e64a6ff2b26e189211d2fd0b7b731 (patch) | |
| tree | 1555f4aafbe4aece6cdf536798cb5080ac2e3df9 /apps | |
| parent | 6b4b9ae6991355102b30f67a12af19a926105e74 (diff) | |
| download | nuttx-d4352a177b3e64a6ff2b26e189211d2fd0b7b731.tar.gz nuttx-d4352a177b3e64a6ff2b26e189211d2fd0b7b731.tar.bz2 nuttx-d4352a177b3e64a6ff2b26e189211d2fd0b7b731.zip | |
Nodes in the pseudo-filesystem can now be renamed or moved within the pseduo-filesystem
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ChangeLog.txt | 7 | ||||
| -rw-r--r-- | apps/nshlib/nsh.h | 6 | ||||
| -rw-r--r-- | apps/nshlib/nsh_command.c | 2 | ||||
| -rw-r--r-- | apps/nshlib/nsh_fscmds.c | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index c5c513d02..cd58a46c7 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -825,9 +825,12 @@ (2014-2-10). * apps/examples/nximage/Kconfig and apps/examples/uip/Kconfig: Incomplete Kconfig files fleshed out by Alan Carvalho de Assis (2014-2-18). - * apps/nshilib: rmdir can now be used in the pseudo-filesystem. Hence, + * apps/nshlib: 'rmdir' can now be used in the pseudo-filesystem. Hence, the command needs to be available even if there are no write-able filesystem enabled (2014-2-19). - * apps/nshilib: mkdir can now be used in the pseudo-filesystem. Hence, + * apps/nshlib: 'mkdir' can now be used in the pseudo-filesystem. Hence, the command needs to be available even if there are no write-able filesystem enabled (2014-2-19). + * apps/nshlib: 'rename' can now be used in the pseudo-filesystem. Hence, + the 'mv' command needs to be available even if there are no write-able + filesystem enabled (2014-2-19). diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index 97afc430f..223799b41 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -720,6 +720,9 @@ void nsh_usbtrace(void); # ifndef CONFIG_NSH_DISABLE_MKDIR int cmd_mkdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif +# ifndef CONFIG_NSH_DISABLE_MV + int cmd_mv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); +# endif # ifndef CONFIG_NSH_DISABLE_RMDIR int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif @@ -752,9 +755,6 @@ void nsh_usbtrace(void); # ifndef CONFIG_NSH_DISABLE_MKRD int cmd_mkrd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_NSH_DISABLE_MV - int cmd_mv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); -# endif # ifndef CONFIG_NSH_DISABLE_RM int cmd_rm(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif diff --git a/apps/nshlib/nsh_command.c b/apps/nshlib/nsh_command.c index 447036bc1..a52a91d4a 100644 --- a/apps/nshlib/nsh_command.c +++ b/apps/nshlib/nsh_command.c @@ -300,7 +300,7 @@ static const struct cmdmap_s g_cmdmap[] = # endif #endif -#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) +#if CONFIG_NFILE_DESCRIPTORS > 0 # ifndef CONFIG_NSH_DISABLE_MV { "mv", cmd_mv, 3, 3, "<old-path> <new-path>" }, # endif diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c index ccd831949..c56be9497 100644 --- a/apps/nshlib/nsh_fscmds.c +++ b/apps/nshlib/nsh_fscmds.c @@ -1298,7 +1298,7 @@ int cmd_mksmartfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_mv ****************************************************************************/ -#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) +#if CONFIG_NFILE_DESCRIPTORS > 0 #ifndef CONFIG_NSH_DISABLE_MV int cmd_mv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { |