Skip to content

Commit c84e378

Browse files
authored
grep: silence stdin warning (#744)
* Make this grep follow the BSD version better * A warning is already printed under trace mode (-T option) for each file argument processed, but there is no need to warn by default * GNU grep doesn't warn for this test case either * Fix a nit where the trace message is supposed to use the variable $name %ifconfig | perl grep -T flags # for example ... grep: checking <STDIN> eth0: flags=4099<UP,BROADCAST,MULTICAST> mtu 1500 lo: flags=73<UP,LOOPBACK,RUNNING> mtu 65536
1 parent d20024a commit c84e378

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

bin/grep

+4-5
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ sub parse_args {
144144

145145
if (defined $opt{'f'}) { # -f patfile
146146
die("$Me: $opt{f}: is a directory\n") if ( -d $opt{f} );
147-
open PATFILE, '<', $opt{f} or die qq($Me: Can't open '$opt{f}': $!);
147+
open PATFILE, '<', $opt{f} or die qq($Me: Can't open '$opt{f}': $!\n);
148148

149149
# make sure each pattern in file is valid
150150
while ( defined( $pattern = <PATFILE> ) ) {
151151
chomp $pattern;
152152
unless ($no_re) {
153153
eval { 'foo' =~ /$pattern/, 1 }
154-
or die "$Me: $opt{f}:$.: bad pattern: $@";
154+
or die "$Me: $opt{f}:$.: bad pattern: $@\n";
155155
}
156156
push @patterns, $pattern;
157157
}
@@ -163,7 +163,7 @@ sub parse_args {
163163
usage() unless defined $pattern;
164164
unless ($no_re) {
165165
eval { 'foo' =~ /$pattern/, 1 }
166-
or die "$Me: bad pattern: $@";
166+
or die "$Me: bad pattern: $@\n";
167167
}
168168
@patterns = ($pattern);
169169
}
@@ -298,7 +298,6 @@ FILE: while ( defined( $file = shift(@_) ) ) {
298298
my $compressed = 0;
299299

300300
if ( $file eq '-' ) {
301-
warn "$Me: reading from stdin\n" if -t STDIN && !$opt->{'s'};
302301
$name = '<STDIN>';
303302
}
304303
elsif ( -d $file ) {
@@ -359,7 +358,7 @@ FILE: while ( defined( $file = shift(@_) ) ) {
359358
}
360359
}
361360

362-
warn "$Me: checking $file\n" if $opt->{T};
361+
warn "$Me: checking $name\n" if $opt->{'T'};
363362

364363
my $fh;
365364
if ( $file eq '-' ) {

0 commit comments

Comments
 (0)