| Message ID | 20231117220506.273238-1-luiz.dentz@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d8fc0dd5942e6e7b95833ee47fc4a8821c0c3421 |
| Headers | show |
| Series | [BlueZ,v2] shared/shell: Remove readline color escapes | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | warning | CheckSparse WARNING src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h): |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=802082 ---Test result--- Test Summary: CheckPatch PASS 0.43 seconds GitLint PASS 0.30 seconds BuildEll PASS 24.42 seconds BluezMake PASS 560.91 seconds MakeCheck PASS 10.27 seconds MakeDistcheck PASS 152.66 seconds CheckValgrind PASS 212.26 seconds CheckSmatch WARNING 317.05 seconds bluezmakeextell PASS 97.32 seconds IncrementalBuild PASS 511.49 seconds ScanBuild PASS 944.20 seconds Details ############################## Test: CheckSmatch - WARNING Desc: Run smatch tool with source Output: src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h): --- Regards, Linux Bluetooth
Hello: This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Fri, 17 Nov 2023 17:05:06 -0500 you wrote: > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > This removes readline color escapes from color defines and instead only > used them with prompt since they are only really useful when readline > is rendering the text, so it can calculate the prompt length properly. > > Fixes: https://github.com/bluez/bluez/issues/10 > > [...] Here is the summary with links: - [BlueZ,v2] shared/shell: Remove readline color escapes https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=d8fc0dd5942e You are awesome, thank you!
diff --git a/src/shared/shell.c b/src/shared/shell.c index fbccff5b54d9..68499b464b69 100644 --- a/src/shared/shell.c +++ b/src/shared/shell.c @@ -1419,10 +1419,18 @@ bool bt_shell_add_submenu(const struct bt_shell_menu *menu) void bt_shell_set_prompt(const char *string) { + char *prompt; + if (!data.init || data.mode) return; - rl_set_prompt(string); + if (asprintf(&prompt, "\001%s\002", string) < 0) + rl_set_prompt(string); + else { + rl_set_prompt(prompt); + free(prompt); + } + rl_redisplay(); } diff --git a/src/shared/shell.h b/src/shared/shell.h index 87fb5c415f20..a9a635bda959 100644 --- a/src/shared/shell.h +++ b/src/shared/shell.h @@ -10,14 +10,14 @@ #include <getopt.h> #include <stdbool.h> -#define COLOR_OFF "\001\x1B[0m\002" -#define COLOR_RED "\001\x1B[0;91m\002" -#define COLOR_GREEN "\001\x1B[0;92m\002" -#define COLOR_YELLOW "\001\x1B[0;93m\002" -#define COLOR_BLUE "\001\x1B[0;94m\002" -#define COLOR_BOLDGRAY "\001\x1B[1;30m\002" -#define COLOR_BOLDWHITE "\001\x1B[1;37m\002" -#define COLOR_HIGHLIGHT "\001\x1B[1;39m\002" +#define COLOR_OFF "\x1B[0m" +#define COLOR_RED "\x1B[0;91m" +#define COLOR_GREEN "\x1B[0;92m" +#define COLOR_YELLOW "\x1B[0;93m" +#define COLOR_BLUE "\x1B[0;94m" +#define COLOR_BOLDGRAY "\x1B[1;30m" +#define COLOR_BOLDWHITE "\x1B[1;37m" +#define COLOR_HIGHLIGHT "\x1B[1;39m" struct bt_shell_menu;
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> This removes readline color escapes from color defines and instead only used them with prompt since they are only really useful when readline is rendering the text, so it can calculate the prompt length properly. Fixes: https://github.com/bluez/bluez/issues/10 --- src/shared/shell.c | 10 +++++++++- src/shared/shell.h | 16 ++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-)