From a81e261e23ac744c297a6ebc882b473a5e46cdf0 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sun, 23 Jun 2019 19:43:34 -0700
Subject: [PATCH] iocsh trap arg. parsing errors

---
 modules/libcom/src/iocsh/iocsh.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/libcom/src/iocsh/iocsh.cpp b/modules/libcom/src/iocsh/iocsh.cpp
index 26ecb5b01..7392bca42 100644
--- a/modules/libcom/src/iocsh/iocsh.cpp
+++ b/modules/libcom/src/iocsh/iocsh.cpp
@@ -868,6 +868,9 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
          * Set up redirection
          */
         if ((openRedirect(filename, lineno, redirects) == 0) && (argc > 0)) {
+            // error unless a function is actually called.
+            // handles command not-found and arg parsing errors.
+            scope.errored = true;
             /*
              * Look up command
              */
@@ -924,7 +927,6 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
             }
             else {
                 showError(filename, lineno, "Command %s not found.", argv[0]);
-                scope.errored = true;
             }
         }
         stopRedirect(filename, lineno, redirects);