1
0
Fork 0

localmodconfig: Rework find_config in streamline_config.pl

Change find_config function to read_config.  It now finds the config,
reads the config into an array, and returns the array.  This makes it
a little cleaner and changes the open to use perl's 3 option open.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
wifi-calibration
Bill Pemberton 2012-08-09 09:23:21 -04:00 committed by Steven Rostedt
parent 224a257190
commit 3f0c541316
1 changed files with 6 additions and 8 deletions

View File

@ -100,7 +100,7 @@ my @searchconfigs = (
},
);
sub find_config {
sub read_config {
foreach my $conf (@searchconfigs) {
my $file = $conf->{"file"};
@ -115,17 +115,15 @@ sub find_config {
print STDERR "using config: '$file'\n";
open(CIN, "$exec $file |") || die "Failed to run $exec $file";
return;
open(my $infile, '-|', "$exec $file") || die "Failed to run $exec $file";
my @x = <$infile>;
close $infile;
return @x;
}
die "No config file found";
}
find_config;
# Read in the entire config file into config_file
my @config_file = <CIN>;
close CIN;
my @config_file = read_config;
# Parse options
my $localmodconfig = 0;