From 681023650e69f6e4fa959c5c6f0480d4a0edf906 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 4 Nov 2007 00:46:03 +0000 Subject: grep: fix -Fo --- findutils/grep.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'findutils') diff --git a/findutils/grep.c b/findutils/grep.c index fc40be244..c2a6a2187 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -174,7 +174,7 @@ static int grep_file(FILE *file) while ((line = xmalloc_getline(file)) != NULL) { llist_t *pattern_ptr = pattern_head; - grep_list_data_t *gl; + grep_list_data_t *gl = gl; /* for gcc */ linenum++; found = 0; @@ -274,8 +274,15 @@ static int grep_file(FILE *file) print_n_lines_after = lines_after; #endif if (option_mask32 & OPT_o) { - line[regmatch.rm_eo] = '\0'; - print_line(line + regmatch.rm_so, linenum, ':'); + if (FGREP_FLAG) { + /* -Fo just prints the pattern + * (unless -v: -Fov doesnt print anything at all) */ + if (found) + print_line(gl->pattern, linenum, ':'); + } else { + line[regmatch.rm_eo] = '\0'; + print_line(line + regmatch.rm_so, linenum, ':'); + } } else { print_line(line, linenum, ':'); } -- cgit v1.2.3