2023-11-17 22:05:22

by Luiz Augusto von Dentz

Subject: [PATCH BlueZ v2] shared/shell: Remove readline color escapes

From: Luiz Augusto von Dentz <[email protected]>

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(-)

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;

--
2.42.0

2023-11-17 23:00:59

by bluez.test.bot

Subject: RE: [BlueZ,v2] shared/shell: Remove readline color escapes

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

2023-11-20 14:50:31

by patchwork-bot+bluetooth

Subject: Re: [PATCH BlueZ v2] shared/shell: Remove readline color escapes

Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[email protected]>:

On Fri, 17 Nov 2023 17:05:06 -0500 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> 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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html