aboutsummaryrefslogtreecommitdiff
path: root/findutils/grep.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-08-23 02:39:47 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-08-23 02:39:47 +0200
commit3d8b96d58d74d775e34de8d19a03db5380eb8f2c (patch)
treec836d8788edcc5af94d8782857f70d9aca5b18a1 /findutils/grep.c
parentb276e418351612341e31da6385edbc3c91d2f6e8 (diff)
downloadbusybox-w32-3d8b96d58d74d775e34de8d19a03db5380eb8f2c.tar.gz
busybox-w32-3d8b96d58d74d775e34de8d19a03db5380eb8f2c.tar.bz2
busybox-w32-3d8b96d58d74d775e34de8d19a03db5380eb8f2c.zip
grep: fix -o match with empty string (suggested by Colin Watson <cjwatson@ubuntu.com>)
function old new delta grep_file 1216 1251 +35 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils/grep.c')
-rw-r--r--findutils/grep.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 688ea6ab2..024f27609 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -461,15 +461,19 @@ static int grep_file(FILE *file)
461 if (found) 461 if (found)
462 print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); 462 print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
463 } else while (1) { 463 } else while (1) {
464 unsigned start = gl->matched_range.rm_so;
464 unsigned end = gl->matched_range.rm_eo; 465 unsigned end = gl->matched_range.rm_eo;
466 unsigned len = end - start;
465 char old = line[end]; 467 char old = line[end];
466 line[end] = '\0'; 468 line[end] = '\0';
467 print_line(line + gl->matched_range.rm_so, 469 /* Empty match is not printed: try "echo test | grep -o ''" */
468 end - gl->matched_range.rm_so, 470 if (len != 0)
469 linenum, ':'); 471 print_line(line + start, len, linenum, ':');
470 if (old == '\0') 472 if (old == '\0')
471 break; 473 break;
472 line[end] = old; 474 line[end] = old;
475 if (len == 0)
476 end++;
473#if !ENABLE_EXTRA_COMPAT 477#if !ENABLE_EXTRA_COMPAT
474 if (regexec(&gl->compiled_regex, line + end, 478 if (regexec(&gl->compiled_regex, line + end,
475 1, &gl->matched_range, REG_NOTBOL) != 0) 479 1, &gl->matched_range, REG_NOTBOL) != 0)