83e49ade5 — BusyBox

Subject

grep: fix -w match if first match isn't a word, but second is. Closes 4520

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

findutils/grep.c+15 -14

@@ -418,13 +418,15 @@ static int grep_file(FILE *file)
	found = 1;
	} else {
	char c = ' ';
-	if (match_at > line \|\| gl->matched_range.rm_so != 0)
+	if (match_at > line \|\| gl->matched_range.rm_so != 0) {
	c = match_at[gl->matched_range.rm_so - 1];
+	}
	if (!isalnum(c) && c != '_') {
	c = match_at[gl->matched_range.rm_eo];
-	if (!c \|\| (!isalnum(c) && c != '_')) {
-	found = 1;
-	} else {
+	}
+	if (!isalnum(c) && c != '_') {
+	found = 1;
+	} else {
	/*
	* Why check gl->matched_range.rm_eo?
	* Zero-length match makes -w skip the line:
@@ -433,18 +435,17 @@ static int grep_file(FILE *file)
	* Without such check, we can loop forever.
	*/
	#if !ENABLE_EXTRA_COMPAT
-	if (gl->matched_range.rm_eo != 0) {
-	match_at += gl->matched_range.rm_eo;
-	match_flg \|= REG_NOTBOL;
-	goto opt_w_again;
-	}
+	if (gl->matched_range.rm_eo != 0) {
+	match_at += gl->matched_range.rm_eo;
+	match_flg \|= REG_NOTBOL;
+	goto opt_w_again;
+	}
	#else
-	if (gl->matched_range.rm_eo > start_pos) {
-	start_pos = gl->matched_range.rm_eo;
-	goto opt_w_again;
-	}
-	#endif
+	if (gl->matched_range.rm_eo > start_pos) {
+	start_pos = gl->matched_range.rm_eo;
+	goto opt_w_again;
	}
+	#endif
	}
	}
	}

testsuite/grep.tests+6 -0

@@ -165,6 +165,12 @@ testing "grep -w word doesn't match wordword" \
	"wordword\n" \
	""

+	testing "grep -w word match second word" \
+	"grep -w word input" \
+	"bword,word\n""wordb,word\n""bwordb,word\n" \
+	"bword,word\n""wordb,word\n""bwordb,word\n" \
+	""
+
	# testing "test name" "commands" "expected result" "file input" "stdin"
	# file input will be file called "input"
	# test can create a file "actual" instead of writing to stdout