From db48370e2cad8f5350847b280ef2b10018f9a5c1 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 9 Aug 2012 09:23:21 -0400 Subject: [PATCH] --- yaml --- r: 323497 b: refs/heads/master c: 3f0c54131679889d64e8b1831bac40c0d64cf511 h: refs/heads/master i: 323495: 7936c68df23c63ecfd57963679cad70e9f460802 v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/streamline_config.pl | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index bf323bc484ef..877528c80cf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 224a257190694f253f7a4c533fd6958d2e5fa669 +refs/heads/master: 3f0c54131679889d64e8b1831bac40c0d64cf511 diff --git a/trunk/scripts/kconfig/streamline_config.pl b/trunk/scripts/kconfig/streamline_config.pl index e3687f98e0c8..62d64ce5c581 100644 --- a/trunk/scripts/kconfig/streamline_config.pl +++ b/trunk/scripts/kconfig/streamline_config.pl @@ -100,7 +100,7 @@ sub dprint { }, ); -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 = ; -close CIN; +my @config_file = read_config; # Parse options my $localmodconfig = 0;