Skip to content

grep: small cleanup #740

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 1 commit into from
Sep 21, 2024
Merged

grep: small cleanup #740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 17 additions & 26 deletions bin/grep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,29 @@ License: perl

use strict;

use File::Basename qw(basename);
use File::Spec;
use Getopt::Std;

our $VERSION = '1.001';
use vars qw($Me $Errors $Grand_Total $Mult %Compress $Matches);

my ( $matcher, $opt ); # matcher - anon. sub to check for matches
# opt - ref to hash w/ command line options
$| = 1; # autoflush output

init(); # initialize globals
my $Me = basename($0);
my $Errors = 0;
my $Grand_Total = 0;
my $Matches;
my $Mult = '';

( $opt, $matcher ) = parse_args(); # get command line options and patterns
my %Compress = (
'z' => 'zcat <', # for uncompressing
'gz' => 'zcat <',
'Z' => 'zcat <',
'bz2' => 'bzcat <',
'zip' => 'unzip -c',
);

my ($opt, $matcher) = parse_args(); # get command line options and patterns
matchfile( $opt, $matcher, @ARGV ); # process files

exit(2) if $Errors;
Expand All @@ -70,23 +80,6 @@ exit(1);

###################################

sub init {
( $Me = $0 ) =~ s!.*/!!; # get basename of program, "tcgrep"
$Errors = $Grand_Total = 0; # initialize global counters
$Mult = ""; # flag for multiple files in @ARGV
$| = 1; # autoflush output

%Compress = ( # file extensions and program names
z => 'zcat <', # for uncompressing
gz => 'zcat <',
Z => 'zcat <',
bz2 => 'bzcat <',
zip => 'unzip -c',
);
}

###################################

sub VERSION_MESSAGE {
print "$Me version $VERSION\n";
exit 0;
Expand Down Expand Up @@ -177,7 +170,6 @@ sub parse_args {
@ARGV = ($opt{'r'} ? '.' : '-') unless @ARGV;

if ( $opt{H} || $opt{u} ) { # highlight or underline
my $term = $ENV{TERM} || 'vt100';
my $terminal;

eval { # try to look up escapes for stand-out
Expand All @@ -199,6 +191,7 @@ sub parse_args {
: ( $terminal->Tputs('us'), $terminal->Tputs('ue') );
}
else { # if use of Term::Cap fails,
my $term = $ENV{'TERM'} || 'vt100';
( $SO, $SE ) = $opt{H} # use tput command to get escapes
? ( `tput -T $term smso`, `tput -T $term rmso` )
: ( `tput -T $term smul`, `tput -T $term rmul` );
Expand Down Expand Up @@ -367,9 +360,7 @@ FILE: while ( defined( $file = shift(@_) ) ) {
next FILE unless $ok;
}

$total = 0;

$Matches = 0;
$total = $Matches = 0;

LINE: while (<$fh>) {
$Matches = 0;
Expand Down
Loading