diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html index 7a72ce04293..9be601afd6f 100644 --- a/Documentation/NuttShell.html +++ b/Documentation/NuttShell.html @@ -3969,11 +3969,6 @@ nsh> CONFIG_NSH_VARS || !CONFIG_DISABLE_ENVIRON CONFIG_NSH_DISABLE_SET - - sh - CONFIG_NFILE_STREAMS > 0 && !CONFIG_NSH_DISABLESCRIPT - CONFIG_NSH_DISABLE_SH - shutdown CONFIG_BOARDCTL_POWEROFF || CONFIG_BOARD_RESET @@ -3984,6 +3979,11 @@ nsh>   CONFIG_NSH_DISABLE_SLEEP + + source + CONFIG_NFILE_STREAMS > 0 && !CONFIG_NSH_DISABLESCRIPT + CONFIG_NSH_DISABLE_SOURCE + telnetd CONFIG_NSH_TELNET diff --git a/boards/arm/kinetis/freedom-k28f/README.txt b/boards/arm/kinetis/freedom-k28f/README.txt index 44d6d156598..9b6d443bfd1 100644 --- a/boards/arm/kinetis/freedom-k28f/README.txt +++ b/boards/arm/kinetis/freedom-k28f/README.txt @@ -57,7 +57,7 @@ STATUS [ cmp false mkdir rm true ? dirname free mh rmdir uname basename dd help mount set umount - break df hexdump mv sh unset + break df hexdump mv source unset cat echo kill mw sleep usleep cd exec ls ps test xd cp exit mb pwd time diff --git a/boards/arm/kinetis/freedom-k64f/README.txt b/boards/arm/kinetis/freedom-k64f/README.txt index 99359fbb392..48fac3535ce 100644 --- a/boards/arm/kinetis/freedom-k64f/README.txt +++ b/boards/arm/kinetis/freedom-k64f/README.txt @@ -306,7 +306,7 @@ f Application Configuration -> Network Utilities cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/kinetis/freedom-k66f/README.txt b/boards/arm/kinetis/freedom-k66f/README.txt index aea3c278294..cfc2c3727ba 100644 --- a/boards/arm/kinetis/freedom-k66f/README.txt +++ b/boards/arm/kinetis/freedom-k66f/README.txt @@ -309,7 +309,7 @@ Networking Support cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index 0ab82aba74b..d79262b960c 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -87,7 +87,7 @@ CONFIG_NSH_DISABLE_MH=y CONFIG_NSH_DISABLE_MKFIFO=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_PUT=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=128 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index e78036efc4f..179023a11bf 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -119,7 +119,7 @@ CONFIG_NSH_DISABLE_MH=y CONFIG_NSH_DISABLE_MKFIFO=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_PUT=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=128 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index 4dfca9a7d74..5d603edaf6b 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -74,7 +74,7 @@ CONFIG_NSH_DISABLE_MV=y CONFIG_NSH_DISABLE_PUT=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_WGET=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 739204b8d1b..c3f65ac1b85 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -122,7 +122,7 @@ CONFIG_NSH_DISABLE_MH=y CONFIG_NSH_DISABLE_MKFIFO=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_PUT=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILE_APPS=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index 3fd55c57a04..25ea881b2a2 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -81,7 +81,7 @@ CONFIG_NSH_DISABLE_MV=y CONFIG_NSH_DISABLE_PUT=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_WGET=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index 99d1920216e..5ade1704f88 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -122,7 +122,7 @@ CONFIG_NSH_DISABLE_MH=y CONFIG_NSH_DISABLE_MKFIFO=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_PUT=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILE_APPS=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index 59ada45572a..362a4634bd9 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -84,7 +84,7 @@ CONFIG_NSH_DISABLE_MH=y CONFIG_NSH_DISABLE_MKFIFO=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_PUT=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_WGET=y CONFIG_NSH_DISABLE_XD=y CONFIG_NSH_FILEIOSIZE=512 diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt index 9e7883a6cdb..cc7ba59963f 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt @@ -865,7 +865,7 @@ Configurations CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y - CONFIG_NSH_DISABLE_SH=y + CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_UNSET=y diff --git a/boards/arm/sam34/sam4e-ek/README.txt b/boards/arm/sam34/sam4e-ek/README.txt index a7b0edbc308..44f53da6b3a 100644 --- a/boards/arm/sam34/sam4e-ek/README.txt +++ b/boards/arm/sam34/sam4e-ek/README.txt @@ -333,7 +333,7 @@ Networking Support cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/sama5/sama5d3-xplained/README.txt b/boards/arm/sama5/sama5d3-xplained/README.txt index 8b3e82d9613..8ebc531a176 100644 --- a/boards/arm/sama5/sama5d3-xplained/README.txt +++ b/boards/arm/sama5/sama5d3-xplained/README.txt @@ -953,7 +953,7 @@ Networking cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/sama5/sama5d3x-ek/README.txt b/boards/arm/sama5/sama5d3x-ek/README.txt index 6d899bf2dc4..e6d8bec8a7a 100644 --- a/boards/arm/sama5/sama5d3x-ek/README.txt +++ b/boards/arm/sama5/sama5d3x-ek/README.txt @@ -1076,7 +1076,7 @@ Networking cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/sama5/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt index 6843b9c858d..69e58a54dcd 100644 --- a/boards/arm/sama5/sama5d4-ek/README.txt +++ b/boards/arm/sama5/sama5d4-ek/README.txt @@ -1438,7 +1438,7 @@ Networking cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig index 3ea022d452e..779b04ad9aa 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig @@ -61,7 +61,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_UMOUNT=y diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt index 953d130ecf7..e009bc62d30 100644 --- a/boards/arm/samv7/same70-xplained/README.txt +++ b/boards/arm/samv7/same70-xplained/README.txt @@ -512,7 +512,7 @@ You can also log into the NSH from the host PC like this: cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt index 3038d37f229..5c6d62cfd10 100644 --- a/boards/arm/samv7/samv71-xult/README.txt +++ b/boards/arm/samv7/samv71-xult/README.txt @@ -842,7 +842,7 @@ You can also log into the NSH from the host PC like this: cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig index b1216d99dc7..d71ef267222 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig @@ -61,7 +61,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_TIME=y diff --git a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig index 6c4ebb4ceaa..6b1d1fdb0af 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig @@ -64,7 +64,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_TIME=y diff --git a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig index e4c9b954709..e76d05ff466 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig @@ -61,7 +61,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_TIME=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig index ac67cd82bae..68c246c459d 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig @@ -56,7 +56,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_DISABLE_UNSET=y diff --git a/boards/arm/stm32/stm32f103-minimum/README.txt b/boards/arm/stm32/stm32f103-minimum/README.txt index bf5b14724b1..2d8a0a10507 100644 --- a/boards/arm/stm32/stm32f103-minimum/README.txt +++ b/boards/arm/stm32/stm32f103-minimum/README.txt @@ -481,7 +481,7 @@ Nokia 5110 LCD Display support: nsh> ? help usage: help [-v] [] - [ dd free mb sh usleep + [ dd free mb source usleep ? echo help mh sleep xd cat exec hexdump mw test cd exit kill pwd true diff --git a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig index 3d165d8b51d..4cda53dbf9f 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig @@ -77,7 +77,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TELNETD=y CONFIG_NSH_DISABLE_TEST=y diff --git a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig index fdcfe44759e..2335b41d892 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig @@ -63,7 +63,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_TIME=y diff --git a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig index 238cbacbe3e..6264e0edd0e 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig @@ -69,7 +69,7 @@ CONFIG_NSH_DISABLE_PWD=y CONFIG_NSH_DISABLE_RM=y CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_SLEEP=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_TIME=y diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt index fd27533a495..a35541a3a6c 100644 --- a/boards/arm/stm32/stm32f4discovery/README.txt +++ b/boards/arm/stm32/stm32f4discovery/README.txt @@ -1201,7 +1201,7 @@ Press Reset pin of the board and you will see: nsh> ? help usage: help [-v] [] - [ cmp free mh sh usleep + [ cmp free mh source usleep ? dirname help mv sleep xd basename dd hexdump mw test break echo kill pwd time diff --git a/boards/arm/tiva/dk-tm4c129x/README.txt b/boards/arm/tiva/dk-tm4c129x/README.txt index fd6d3b0c6ea..efe1e9234fd 100644 --- a/boards/arm/tiva/dk-tm4c129x/README.txt +++ b/boards/arm/tiva/dk-tm4c129x/README.txt @@ -338,7 +338,7 @@ Networking Support cp free kill mkrd put usleep cmp get losetup mh rm wget dd help ls mount rmdir xd - df hexdump mb mv sh + df hexdump mb mv source Builtin Apps: nsh> diff --git a/boards/mips/pic32mx/mirtoo/README.txt b/boards/mips/pic32mx/mirtoo/README.txt index 0ad7482c1aa..ec0ba3331fc 100644 --- a/boards/mips/pic32mx/mirtoo/README.txt +++ b/boards/mips/pic32mx/mirtoo/README.txt @@ -938,7 +938,7 @@ Where is one of the following: CONFIG_NSH_DISABLE_MKFIFO=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_PUT=y - CONFIG_NSH_DISABLE_SH=y + CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_TEST=y CONFIG_NSH_DISABLE_WGET=y diff --git a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig index 320c42a1b63..4163985b8db 100644 --- a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig +++ b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig @@ -37,7 +37,7 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_DISABLE_KILL=y -CONFIG_NSH_DISABLE_SH=y +CONFIG_NSH_DISABLE_SOURCE=y CONFIG_NSH_DISABLE_TEST=y CONFIG_PIC32MX_DEBUGGER=1 CONFIG_PIC32MX_ICESEL=2