apply post-1.12.1 patches, bump version to 1.12.21_12_2

1 files changed, 12 insertions, 2 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index 9d38ef912..73e74f4b3 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -363,12 +363,22 @@ static int grep_file(FILE *file)
                                                  * (unless -v: -Fov doesnt print anything at all) */
                                                 if (found)
                                                         print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
-                                        } else {
+                                        } else while (1) {
+                                                char old = line[gl->matched_range.rm_eo];
                                                 line[gl->matched_range.rm_eo] = '\0';
                                                 print_line(line + gl->matched_range.rm_so,
                                                                 gl->matched_range.rm_eo - gl->matched_range.rm_so,
                                                                 linenum, ':');
-                                        }
+                                                line[gl->matched_range.rm_eo] = old;
+#if !ENABLE_EXTRA_COMPAT
+                                                break;
+#else
+                                                if (re_search(&gl->compiled_regex, line, line_len,
+                                                                gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo, 
+                                                                &gl->matched_range) < 0)
+                                                        break;
+#endif
+                                        } 
                                 } else {
                                         print_line(line, line_len, linenum, ':');
                                 }