Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de7b0b41 authored by Jim Cromie's avatar Jim Cromie Committed by Michal Marek
Browse files

export_report: do collectcfiles work in perl itself



Avoid spawning a shell pipeline doing cat, grep, sed, and do it all
inside perl.  The <*.c> globbing 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: default avatarJim 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
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 2ee2d292
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -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 "cannot 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;
}