You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/09/12 03:37:22 UTC

[incubator-nuttx-apps] branch master updated: nsh: fix compile break about closing CONFIG_NSH_DISABLESCRIPT

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a5448d  nsh: fix compile break about closing CONFIG_NSH_DISABLESCRIPT
5a5448d is described below

commit 5a5448df040b42944949a44210f4ae4ecba3a71c
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Fri Sep 10 22:29:01 2021 +0800

    nsh: fix compile break about closing CONFIG_NSH_DISABLESCRIPT
    
    Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
 nshlib/nsh_consolemain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nshlib/nsh_consolemain.c b/nshlib/nsh_consolemain.c
index 5cf09d4..135923c 100644
--- a/nshlib/nsh_consolemain.c
+++ b/nshlib/nsh_consolemain.c
@@ -77,7 +77,7 @@ int nsh_consolemain(int argc, FAR char *argv[])
   usbtrace_enable(TRACE_BITSET);
 #endif
 
-#ifdef CONFIG_NSH_ROMFSETC
+#if defined(CONFIG_NSH_ROMFSETC) && !defined(CONFIG_NSH_DISABLESCRIPT)
   /* Execute the start-up script */
 
   nsh_initscript(&pstate->cn_vtbl);