From: Bill Pemberton <[email protected]>

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 <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
---
 scripts/kconfig/streamline_config.pl |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl 
b/scripts/kconfig/streamline_config.pl
index e3687f9..62d64ce 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;
-- 
1.7.10.4


Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to