diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-03 20:27:30 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-03 20:27:30 +0000 |
commit | 92fd8f5221ca528c2def13897c712d558adf1675 (patch) | |
tree | 0c9d63fe3408864b46597a4eb1c20eace2ffc783 /apps/nshlib/nsh_apps.c | |
parent | 90e92459a9c7a33fb8a005f87ec3f512b760c487 (diff) | |
download | nuttx-92fd8f5221ca528c2def13897c712d558adf1675.tar.gz nuttx-92fd8f5221ca528c2def13897c712d558adf1675.tar.bz2 nuttx-92fd8f5221ca528c2def13897c712d558adf1675.zip |
More FTP bugfixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3665 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib/nsh_apps.c')
-rw-r--r-- | apps/nshlib/nsh_apps.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/apps/nshlib/nsh_apps.c b/apps/nshlib/nsh_apps.c index 0d460a391..ec3d6ec88 100644 --- a/apps/nshlib/nsh_apps.c +++ b/apps/nshlib/nsh_apps.c @@ -89,9 +89,6 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, FAR char *argv[]) { -#ifndef CONFIG_APPS_BINDIR - FAR const char * name; -#endif int ret = OK; /* Try to find command within pre-built application list. */ @@ -99,30 +96,7 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, ret = exec_namedapp(cmd, argv); if (ret < 0) { - int err = -errno; -#ifndef CONFIG_APPS_BINDIR - int i; - - /* On failure, list the set of available built-in commands */ - - nsh_output(vtbl, "Builtin Apps: "); - for (i = 0; (name = namedapp_getname(i)) != NULL; i++) - { - 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 */ - - if (strcmp(cmd, "?") != 0) - { - return err; - } - - return OK; -#else - return err; -#endif + return -errno; } #ifdef CONFIG_SCHED_WAITPID |