summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-08-09 09:23:21 -0400
committerSteven Rostedt <rostedt@goodmis.org>2012-08-16 16:09:16 -0400
commit3f0c54131679889d64e8b1831bac40c0d64cf511 (patch)
treec59112444732061b62261d4e97205f9efbc0be33 /scripts
parent224a257190694f253f7a4c533fd6958d2e5fa669 (diff)
downloadlinux-3f0c54131679889d64e8b1831bac40c0d64cf511.tar.bz2
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/streamline_config.pl14
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index e3687f98e0c8..62d64ce5c581 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -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;