diff --git a/components/system/source/shell/sh.c b/components/system/source/shell/sh.c index 230ead6..602fc86 100755 --- a/components/system/source/shell/sh.c +++ b/components/system/source/shell/sh.c @@ -317,29 +317,23 @@ static int _register_cmd_check_fn(sh_t *sh_hdl, const sh_cmd_reg_t *sh_reg, char if (strlen(cmd->cmd) >= CONFIG_SH_MAX_CMD_LEN) { - if (sh_hdl && sh_hdl->disable_echo == 0) - { - SYS_LOG_WRN("cmd: Command length exceeds the maximum limit!\r\n" - "Defined in file: %s:%d\r\n" - "Command: '%s'", - _FILENAME(sh_reg->file), - sh_reg->line, - cmd->cmd); - } + SYS_LOG_WRN("cmd: Command length exceeds the maximum limit!\r\n" + "Defined in file: %s:%d\r\n" + "Command: '%s'", + _FILENAME(sh_reg->file), + sh_reg->line, + cmd->cmd); return -1; } if (strchr(cmd->cmd, ' ')) { - if (sh_hdl && sh_hdl->disable_echo == 0) - { - SYS_LOG_WRN("cmd: Command cannot contain spaces!\r\n" - "Defined in file: %s:%d\r\n" - "Command: '%s'", - _FILENAME(sh_reg->file), - sh_reg->line, - cmd->cmd); - } + SYS_LOG_WRN("cmd: Command cannot contain spaces!\r\n" + "Defined in file: %s:%d\r\n" + "Command: '%s'", + _FILENAME(sh_reg->file), + sh_reg->line, + cmd->cmd); return -1; } diff --git a/components/system/source/shell/sh.h b/components/system/source/shell/sh.h index 69e9515..1857175 100755 --- a/components/system/source/shell/sh.h +++ b/components/system/source/shell/sh.h @@ -32,7 +32,7 @@ #endif #ifndef CONFIG_SH_MAX_CMD_LEN -#define CONFIG_SH_MAX_CMD_LEN ((CONFIG_SH_MAX_PARAM / 10) > 10 ? (CONFIG_SH_MAX_PARAM / 10) : 10) /* 最大单个命令长度(包含结束符 '\0' ) */ +#define CONFIG_SH_MAX_CMD_LEN ((CONFIG_SH_MAX_LINE_LEN / 10) > 10 ? (CONFIG_SH_MAX_LINE_LEN / 10) : 10) /* 最大单个命令长度(包含结束符 '\0' ) */ #endif typedef struct sh_obj_def sh_t; @@ -102,7 +102,7 @@ typedef struct sh_cmd typedef struct { - sys_psnode_t *reg_node; // 注意时设置的节点 + sys_psnode_t *reg_node; // 注册节点 const sh_cmd_t *cmd; // 命令数据 const char *file; // 文件 int line; // 行号