regex: Support \S (#3817)

rizinorg · Sep 1, 2023 · c21764d · c21764d
1 parent 681a6b0
commit c21764d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/librz/util/regex/regcomp.c b/librz/util/regex/regcomp.c
@@ -1116,8 +1116,14 @@ special(struct parse *p, int ch) {
 		ordinary(p, '\r');
 		return;
 	case 's':
-		num = 5;
-		memcpy(bracket, "\t\r\n ]", num);
+	case 'S':
+		num = 6;
+		const char *chars = "^\t\r\n ]";
+		if (ch == 's') {
+			num--;
+			chars++;
+		}
+		memcpy(bracket, chars, num);
 		break;
 	case 'd':
 		num = 4;

diff --git a/test/db/archos/linux-x64/dbg_trace1 b/test/db/archos/linux-x64/dbg_trace1
@@ -24,7 +24,7 @@ dcu main
 ds 2  # Should be dsui call; ds
 dbt~[6-]  # dbtt here would be nice
 EOF
-REGEXP_FILTER_OUT=(loc\.[a-zA-Z0-9_]+.|main\+\d+.|entry0\+\d+.)
+REGEXP_FILTER_OUT=(loc\.\S+.|main\+\d+.|entry0\+\d+.)
 EXPECT=<<EOF
 loc.func_0 loc.func_00
 main+8