Skip to content

grep: shortcut exit path for -q #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 12, 2024
Merged

grep: shortcut exit path for -q #710

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8baa0c
grep: shortcut exit path for -q
mknos Aug 10, 2024
dd92bfc
avoid printing $Mult flag as part of string for grep -c
mknos Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions bin/grep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,25 +383,30 @@ FILE: while ( defined( $file = shift(@_) ) ) {
next LINE unless $Matches;

$total += $Matches;
last FILE if $opt->{'q'}; # single match for all files

if ( $opt->{p} || $opt->{P} ) {
s/\n{2,}$/\n/ if $opt->{p};
chomp if $opt->{P};
}

print("$name\n"), next FILE if $opt->{l};
my $showmatch = !$opt->{'q'} && !$opt->{'c'};
if ($showmatch) {
if ($opt->{'l'}) {
print $name, "\n";
next FILE;
}
unless ($opt->{'c'}) {
print($name, ':') if $Mult;
print $opt->{n} ? "$.:" : "", $_,
( $opt->{p} || $opt->{P} ) && ( '-' x 20 ) . "\n";
}

next FILE if (!$opt->{'c'} && $opt->{'1'} || $opt->{'q'}); # single match
next FILE if $opt->{'1'}; # single match per file
}
}
continue {
print $Mult && "$name:", $total, "\n" if $opt->{c};
if ($opt->{'c'}) {
print($name, ':') if $Mult;
print $total, "\n";
}
close FILE;
}
$Grand_Total += $total;
Expand Down
Loading