search: Use blue dot for nonprintable chars

rizinorg · Feb 7, 2025 · d6c0ccf · d6c0ccf
1 parent f2ddbd7
commit d6c0ccf
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 33 deletions.
diff --git a/librz/core/cmd/cmd_search.c b/librz/core/cmd/cmd_search.c
@@ -404,7 +404,7 @@ RZ_API int rz_core_search_preludes(RzCore *core, bool log) {
 }
 
 /* TODO: maybe move into util/str */
-static char *getstring(char *b, int l) {
+static char *getstring(char *b, int l, bool use_color) {
 	char *r, *res = malloc(l + 1);
 	int i;
 	if (!res) {
@@ -415,7 +415,7 @@ static char *getstring(char *b, int l) {
 			*r++ = *b;
 		} else {
 			// This is very ASCII-centric
-			*r++ = '.';
+			*r++ = use_color ? '\xff' : '.';
 		}
 	}
 	*r = 0;
@@ -449,19 +449,45 @@ static int _cb_hit(RzSearchKeyword *kw, void *user, ut64 addr) {
 			char *buf = calloc(1, len + 32 + ctx * 2);
 			type = "string";
 			rz_io_read_at(core->io, addr - prectx, (ut8 *)buf, len + (ctx * 2));
-			pre = getstring(buf, prectx);
-			pos = getstring(buf + prectx + len, ctx);
+			pre = getstring(buf, prectx, use_color);
+			pos = getstring(buf + prectx + len, ctx, use_color);
 			if (!pos) {
 				pos = rz_str_dup("");
 			}
 			if (param->outmode == RZ_MODE_JSON) {
-				wrd = getstring(buf + prectx, len);
+				wrd = getstring(buf + prectx, len, false);
 				s = rz_str_newf("%s%s%s", pre, wrd, pos);
 			} else {
 				wrd = rz_str_utf16_encode(buf + prectx, len);
-				s = rz_str_newf(use_color ? "\"%s" Color_YELLOW "%s" Color_RESET "%s\""
-							  : "\"%s%s%s\"",
-					pre, wrd, pos);
+				if (use_color) {
+					char *ptr;
+					RzBuffer *pre_color = rz_buf_new_with_bytes(NULL, 0);
+					for (ptr = pre; *ptr; ptr++) {
+						if (*ptr == '\xff') {
+							rz_buf_append_string(pre_color, Color_BLUE "." Color_RESET);
+						} else {
+							rz_buf_append_bytes(pre_color, (const ut8 *)ptr, 1);
+						}
+					}
+					RzBuffer *pos_color = rz_buf_new_with_bytes(NULL, 0);
+					for (ptr = pos; *ptr; ptr++) {
+						if (*ptr == '\xff') {
+							rz_buf_append_string(pos_color, Color_BLUE "." Color_RESET);
+						} else {
+							rz_buf_append_bytes(pos_color, (const ut8 *)ptr, 1);
+						}
+					}
+					char *pre_color_str = rz_buf_to_string(pre_color);
+					char *pos_color_str = rz_buf_to_string(pos_color);
+					s = rz_str_newf("\"%s" Color_YELLOW "%s" Color_RESET "%s\"",
+						pre_color_str, wrd, pos_color_str);
+					free(pre_color_str);
+					free(pos_color_str);
+					rz_buf_free(pre_color);
+					rz_buf_free(pos_color);
+				} else {
+					s = rz_str_newf("\"%s%s%s\"", pre, wrd, pos);
+				}
 			}
 			free(buf);
 			free(pre);

diff --git a/test/db/cmd/regexp b/test/db/cmd/regexp
@@ -64,16 +64,16 @@ echo -- 5 --
 EOF
 EXPECT=<<EOF
 -- 1 --
-0x00000001 hit0_0 "a[33mbcd[0m............bccc"
-0x00000010 hit0_1 "abcd............[33mbcccd[0me..............."
+0x00000001 hit0_0 "a[33mbcd[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0mbccc"
+0x00000010 hit0_1 "abcd[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mbcccd[0me[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
 -- 2 --
 -- 3 --
-0x00000001 hit2_0 "a[33mbcd[0m............bccc"
-0x00000010 hit2_1 "abcd............[33mbcccd[0me..............."
+0x00000001 hit2_0 "a[33mbcd[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0mbccc"
+0x00000010 hit2_1 "abcd[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mbcccd[0me[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
 -- 4 --
-0x00000001 hit3_0 "a[33mbcd[0m............bccc"
+0x00000001 hit3_0 "a[33mbcd[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0mbccc"
 -- 5 --
-0x00000010 hit4_0 "abcd............[33mbcccd[0me..............."
+0x00000010 hit4_0 "abcd[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mbcccd[0me[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
 EOF
 EXPECT_ERR=<<EOF
 Searching in [0x0,0x200)
@@ -101,10 +101,10 @@ echo ----
 /e /b.*d$/
 EOF
 EXPECT=<<EOF
-0x000000fe hit0_0 "................[33mbcccd[0me..............."
-0x000001fe hit0_1 "................[33mbd[0m................"
+0x000000fe hit0_0 "[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mbcccd[0me[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
+0x000001fe hit0_1 "[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mbd[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
 ----
-0x000001fe hit1_0 "................[33mbd[0m................"
+0x000001fe hit1_0 "[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mbd[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
 EOF
 EXPECT_ERR=<<EOF
 Searching in [0x0,0x200)
@@ -123,23 +123,23 @@ echo ----
 /e /lib/
 EOF
 EXPECT=<<EOF
-0x00400239 hit0_0 ".............../[33mlib[0m64/ld-linux-x86-"
-0x00400f19 hit0_1 ".a..............[33mlib[0mselinux.so.1._IT"
-0x00400fae hit0_2 "etfilecon._fini.[33mlib[0macl.so.1.acl_get"
-0x00400feb hit0_3 "l_extended_file.[33mlib[0mc.so.6.fflush.st"
-0x004013c3 hit0_4 "cmp.tcgetpgrp.__[33mlib[0mc_start_main.dir"
-0x0041769a hit0_5 "system call.../.[33mlib[0ms/.lt-.........."
-0x004186e0 hit0_6 "emory exhausted.[33mlib[0m/xstrtol.c...0 <"
-0x00418e58 hit0_7 "xstrtoumax./usr/[33mlib[0m.ASCII.CHARSETAL"
+0x00400239 hit0_0 "[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m/[33mlib[0m64/ld-linux-x86-"
+0x00400f19 hit0_1 "[34m.[0ma[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mlib[0mselinux.so.1[34m.[0m_IT"
+0x00400fae hit0_2 "etfilecon[34m.[0m_fini[34m.[0m[33mlib[0macl.so.1[34m.[0macl_get"
+0x00400feb hit0_3 "l_extended_file[34m.[0m[33mlib[0mc.so.6[34m.[0mfflush[34m.[0mst"
+0x004013c3 hit0_4 "cmp[34m.[0mtcgetpgrp[34m.[0m__[33mlib[0mc_start_main[34m.[0mdir"
+0x0041769a hit0_5 "system call.[34m.[0m[34m.[0m/.[33mlib[0ms/[34m.[0mlt-[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
+0x004186e0 hit0_6 "emory exhausted[34m.[0m[33mlib[0m/xstrtol.c[34m.[0m[34m.[0m[34m.[0m0 <"
+0x00418e58 hit0_7 "xstrtoumax[34m.[0m/usr/[33mlib[0m[34m.[0mASCII[34m.[0mCHARSETAL"
 ----
-0x00400239 hit1_0 ".............../[33mlib[0m64/ld-linux-x86-"
-0x00400f19 hit1_1 ".a..............[33mlib[0mselinux.so.1._IT"
-0x00400fae hit1_2 "etfilecon._fini.[33mlib[0macl.so.1.acl_get"
-0x00400feb hit1_3 "l_extended_file.[33mlib[0mc.so.6.fflush.st"
-0x004013c3 hit1_4 "cmp.tcgetpgrp.__[33mlib[0mc_start_main.dir"
-0x0041769a hit1_5 "system call.../.[33mlib[0ms/.lt-.........."
-0x004186e0 hit1_6 "emory exhausted.[33mlib[0m/xstrtol.c...0 <"
-0x00418e58 hit1_7 "xstrtoumax./usr/[33mlib[0m.ASCII.CHARSETAL"
+0x00400239 hit1_0 "[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m/[33mlib[0m64/ld-linux-x86-"
+0x00400f19 hit1_1 "[34m.[0ma[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[33mlib[0mselinux.so.1[34m.[0m_IT"
+0x00400fae hit1_2 "etfilecon[34m.[0m_fini[34m.[0m[33mlib[0macl.so.1[34m.[0macl_get"
+0x00400feb hit1_3 "l_extended_file[34m.[0m[33mlib[0mc.so.6[34m.[0mfflush[34m.[0mst"
+0x004013c3 hit1_4 "cmp[34m.[0mtcgetpgrp[34m.[0m__[33mlib[0mc_start_main[34m.[0mdir"
+0x0041769a hit1_5 "system call.[34m.[0m[34m.[0m/.[33mlib[0ms/[34m.[0mlt-[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m[34m.[0m"
+0x004186e0 hit1_6 "emory exhausted[34m.[0m[33mlib[0m/xstrtol.c[34m.[0m[34m.[0m[34m.[0m0 <"
+0x00418e58 hit1_7 "xstrtoumax[34m.[0m/usr/[33mlib[0m[34m.[0mASCII[34m.[0mCHARSETAL"
 EOF
 EXPECT_ERR=<<EOF
 Searching 3 bytes in [0x61d368,0x61d720)