/e: Set RZ_REGEX_MULTILINE for ^ and $ (#4868)

* `/e`: Set `RZ_REGEX_MULTILINE` for `^` and `$` * Add note in `/e` help for `^` and `$` Co-authored-by: Rot127 <[email protected]>
rizinorg · Jan 29, 2025 · 303b39e · 303b39e
1 parent 8d391b7
commit 303b39e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/librz/core/cmd/cmd_search.c b/librz/core/cmd/cmd_search.c
@@ -42,7 +42,7 @@ static const char *help_msg_slash[] = {
 	"/b", "", "search backwards, command modifier, followed by other command",
 	"/c", "[?][adr]", "search for crypto materials",
 	"/d", " 101112", "search for a deltified sequence of bytes",
-	"/e", " /pattern/[i]", "match regular expression",
+	"/e", " /pattern/[i]", "match regular expression (beginning-of-string for ^ and $ is '\\0')",
 	"/E", " esil-expr", "offset matching given esil expressions $$ = here",
 	"/f", "", "search forwards, (command modifier)",
 	"/F", " file [off] [sz]", "search contents of file with offset and size",

diff --git a/librz/search/regexp.c b/librz/search/regexp.c
@@ -20,7 +20,7 @@ RZ_API int rz_search_regexp_update(RzSearch *s, ut64 from, const ut8 *buf, int l
 	rz_regex_set_nul_as_newline(ccontext);
 
 	rz_list_foreach (s->kws, iter, kw) {
-		int cflags = RZ_REGEX_EXTENDED;
+		int cflags = RZ_REGEX_EXTENDED | RZ_REGEX_MULTILINE;
 
 		if (kw->icase) {
 			cflags |= RZ_REGEX_CASELESS;

diff --git a/test/db/cmd/regexp b/test/db/cmd/regexp
@@ -51,19 +51,29 @@ CMDS=<<EOF
 w abcd
 w bcccde @ 0x10
 e scr.color=1
+echo -- 1 --
 /e /b.*d/
-echo ----
+echo -- 2 --
 /e /b.*D/
-echo ----
+echo -- 3 --
 /e /b.*D/i
+echo -- 4 --
+/e /b.*d$/
+echo -- 5 --
+/e /^b.*d/
 EOF
 EXPECT=<<EOF
+-- 1 --
 0x00000001 hit0_0 .a[33mbcd[0mbccc.
 0x00000010 hit0_1 .abcd[33mbcccd[0me.
-----
-----
+-- 2 --
+-- 3 --
 0x00000001 hit2_0 .a[33mbcd[0mbccc.
 0x00000010 hit2_1 .abcd[33mbcccd[0me.
+-- 4 --
+0x00000001 hit3_0 .a[33mbcd[0mbccc.
+-- 5 --
+0x00000010 hit4_0 .abcd[33mbcccd[0me.
 EOF
 EXPECT_ERR=<<EOF
 Searching in [0x0-0x200]
@@ -72,5 +82,9 @@ Searching in [0x0-0x200]
 [2Khits: 0
 Searching in [0x0-0x200]
 [2Khits: 2
+Searching in [0x0-0x200]
+[2Khits: 1
+Searching in [0x0-0x200]
+[2Khits: 1
 EOF
 RUN