From dba37513a15f171f8721e89be7c8dc6079963556 Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Thu, 5 Aug 2021 10:07:55 +0800 Subject: [PATCH] fix(emqx_ctl): fix an error when "~" in the print content --- apps/emqx/src/emqx_ctl.erl | 4 ++-- apps/emqx/test/emqx_ctl_SUITE.erl | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emqx/src/emqx_ctl.erl b/apps/emqx/src/emqx_ctl.erl index 051d4de6f..a71398095 100644 --- a/apps/emqx/src/emqx_ctl.erl +++ b/apps/emqx/src/emqx_ctl.erl @@ -136,11 +136,11 @@ help() -> -spec(print(io:format()) -> ok). print(Msg) -> - io:format(format(Msg)). + io:format("~s", [format(Msg)]). -spec(print(io:format(), [term()]) -> ok). print(Format, Args) -> - io:format(format(Format, Args)). + io:format("~s", [format(Format, Args)]). -spec(usage([cmd_usage()]) -> ok). usage(UsageList) -> diff --git a/apps/emqx/test/emqx_ctl_SUITE.erl b/apps/emqx/test/emqx_ctl_SUITE.erl index 4f8224871..2907ff787 100644 --- a/apps/emqx/test/emqx_ctl_SUITE.erl +++ b/apps/emqx/test/emqx_ctl_SUITE.erl @@ -67,10 +67,12 @@ t_run_commands(_) -> t_print(_) -> ok = emqx_ctl:print("help"), ok = emqx_ctl:print("~s", [help]), + ok = emqx_ctl:print("~s", [<<"~!@#$%^&*()">>]), % - check the output of the usage mock_print(), ?assertEqual("help", emqx_ctl:print("help")), ?assertEqual("help", emqx_ctl:print("~s", [help])), + ?assertEqual("~!@#$%^&*()", emqx_ctl:print("~s", [<<"~!@#$%^&*()">>])), unmock_print(). t_usage(_) ->