| Message ID | 1305966108-13399-2-git-send-email-jim.cromie@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, May 21, 2011 1:21 am, Jim Cromie wrote: > sub collectcfiles { > - my @file > - = `cat .tmp_versions/*.mod | grep '.*\.ko\$' | sed s/\.ko$/.mod.c/`; > + my @file; > + while (<.tmp_versions/*.mod>) { > + open my $fh, '<', $_ or die "cant open $_: $!\n"; Use either "can't" or "cannot". "cant" is a different word. > + push (@file, > + grep s/\.ko/.mod.c/, # change the suffix > + grep m/.+\.ko/, # find the .ko path > + <$fh>); # lines in opened file > + } > chomp @file; > return @file; > }
diff --git a/scripts/export_report.pl b/scripts/export_report.pl index 04dce7c..5499ff0 100644 --- a/scripts/export_report.pl +++ b/scripts/export_report.pl @@ -49,8 +49,14 @@ sub usage { } sub collectcfiles { - my @file - = `cat .tmp_versions/*.mod | grep '.*\.ko\$' | sed s/\.ko$/.mod.c/`; + my @file; + while (<.tmp_versions/*.mod>) { + open my $fh, '<', $_ or die "cant open $_: $!\n"; + push (@file, + grep s/\.ko/.mod.c/, # change the suffix + grep m/.+\.ko/, # find the .ko path + <$fh>); # lines in opened file + } chomp @file; return @file; }
avoid spawning a shell pipeline doing cat, grep, sed, and do it all inside perl. The <*.c> construct works at least as far back as 5.8.9 Note that this is not just an optimization; the sed command in the pipeline was unterminated, due to lack of escape on the end-of-line (\$) in the regex, resulting in this: $ perl ../linux-2.6/scripts/export_report.pl > /dev/null sed: -e expression #1, char 5: unterminated `s' command sh: .mod.c/: not found Comments on an earlier patch sought an all-perl implementation. Signed-off-by: Jim Cromie <jim.cromie@gmail.com> cc: Michal Marek <mmarek@suse.cz>, cc: linux-kbuild@vger.kernel.org cc: Arnaud Lacombe lacombar@gmail.com cc: Stephen Hemminger shemminger@vyatta.com --- scripts/export_report.pl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)