helper: shutdown command should return with 0 exit status

[openocd.git] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index 85abe6bcf0328ff4c4d1fbec32b223107d6af95a..9d19cff4f870630555d545565bfdbf0e7a445bfa 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -365,7 +365,7 @@ static int register_command_handler(struct command_context *cmd_ctx,
 
        LOG_DEBUG("registering '%s'...", ocd_name);
 
-       Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
+       Jim_CmdProc *func = c->handler ? &script_command : &command_unknown;
        int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
        free(ocd_name);
        if (JIM_OK != retval)
@@ -660,7 +660,10 @@ int command_run_line(struct command_context *context, char *line)
                Jim_DeleteAssocData(interp, "context");
        }
        if (retcode == JIM_ERR) {
-               if (retval != ERROR_COMMAND_CLOSE_CONNECTION) {
+               if (retval == ERROR_COMMAND_CLOSE_CONNECTION) {
+                       /* Shutdown request is not an error */
+                       return ERROR_OK;
+               } else {
                        /* We do not print the connection closed error message */
                        Jim_MakeErrorMessage(interp);
                        LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL));
@@ -868,7 +871,7 @@ static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
        free(cmd_name);
 
        if (is_match) {
-               if (c->usage) {
+               if (c->usage && strlen(c->usage) > 0) {
                        LOG_USER_N(" ");
                        command_help_show_wrap(c->usage, 0, n + 5);
                } else
@@ -1070,8 +1073,10 @@ static int jim_command_type(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                Jim_SetResultString(interp, "native", -1);
        else if (c->handler)
                Jim_SetResultString(interp, "simple", -1);
-       else
+       else if (remaining == 0)
                Jim_SetResultString(interp, "group", -1);
+       else
+               Jim_SetResultString(interp, "unknown", -1);
 
        return JIM_OK;
 }