summaryrefslogtreecommitdiff
path: root/apps/nshlib/nsh_apps.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-26 01:04:10 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-26 01:04:10 +0000
commit54150a8f62d57bd3af5efce1439ba3c29e20f07f (patch)
tree4c791787398c9f76ccd9c8a56e1dd139c2a4e8e4 /apps/nshlib/nsh_apps.c
parentc62abcf9c8c26757ac5e6fbf0fd9813f1ba087a6 (diff)
downloadnuttx-54150a8f62d57bd3af5efce1439ba3c29e20f07f.tar.gz
nuttx-54150a8f62d57bd3af5efce1439ba3c29e20f07f.tar.bz2
nuttx-54150a8f62d57bd3af5efce1439ba3c29e20f07f.zip
Incorporate changes from Uros Platise
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3419 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib/nsh_apps.c')
-rw-r--r--apps/nshlib/nsh_apps.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/nshlib/nsh_apps.c b/apps/nshlib/nsh_apps.c
index e792f0781..7ebc1280e 100644
--- a/apps/nshlib/nsh_apps.c
+++ b/apps/nshlib/nsh_apps.c
@@ -107,8 +107,15 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
nsh_output(vtbl, "%s ", name);
}
nsh_output(vtbl, "\nand type 'help' for more NSH commands.\n\n");
+
+ /* If the failing command was '?', then do not report an error */
- return err;
+ if (strcmp(cmd, "?") != 0)
+ {
+ return err;
+ }
+
+ return OK;
}
#ifdef CONFIG_SCHED_WAITPID