From d8a46b5b6befc72bb7142850fc4f4c1fd7fb1c1b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 30 Jul 2019 09:56:28 -0700 Subject: Move the empty regex workaround into xregcomp. No current caller except grep needs this, but consistency seems like a good idea. Also change the xregcomp error message to be a bit more human-readable, rather than mention an implementation detail. --- toys/posix/grep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'toys/posix') diff --git a/toys/posix/grep.c b/toys/posix/grep.c index f2ab2a0d..1fa1a7c4 100644 --- a/toys/posix/grep.c +++ b/toys/posix/grep.c @@ -404,9 +404,8 @@ static void parse_regex(void) if (FLAG(o) && !*al->arg) continue; dlist_add_nomalloc(&TT.reg, (void *)(shoe = xmalloc(sizeof(struct reg)))); - // BSD regcomp doesn't support empty regex, so we fake that. - xregcomp(&shoe->r, *al->arg ? al->arg : "()", - (REG_EXTENDED*(!!FLAG(E)|!*al->arg))|(REG_ICASE*!!FLAG(i))); + xregcomp(&shoe->r, al->arg, + (REG_EXTENDED*!!FLAG(E))|(REG_ICASE*!!FLAG(i))); } dlist_terminate(TT.reg); } -- cgit v1.2.3