holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Combine two pattern matches

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6927 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-21 19:24:43 +00:00
parent 7d7feff03f
commit 01a7a480e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Config.pm
View File

@ -875,10 +875,10 @@ sub read_a_line() {
# #
# Expand Shell Variables using %ENV # Expand Shell Variables using %ENV
# #
while ( $currentline =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/ || $currentline =~ /^(.*?)\${([a-zA-Z]\w*)}(.*)$/ ) { while ( $currentline =~ /^(.*?)\$({)?([a-zA-Z]\w*)(?(2)}|)(.*)$/ ) {
my $val = $ENV{$2}; my $val = $ENV{$3};
$val = '' unless defined $val; $val = '' unless defined $val;
$currentline = join( '', $1 , $val , $3 ); $currentline = join( '', $1 , $val , $4 );
} }
if ( $currentline =~ /^\s*INCLUDE\s/ ) { if ( $currentline =~ /^\s*INCLUDE\s/ ) {