extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-15 19:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-allow leading whitespace before INCLUDE

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6732 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-30 17:12:57 +00:00
parent f10e9e42d5
commit 2f29623ab1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -549,20 +549,16 @@ sub read_a_line {
#
# Ignore ( concatenated ) Blank Lines
#
if ( $line =~ /^\s*$/ ) {
$line = '';
next;
}
$line = '', next if $line =~ /^\s*$/;
#
# Expand Shell Variables using %ENV
#
$line = join( '', $1 , ( $ENV{$2} || '' ) , $3 ) while $line =~ /^(.*?)\${([a-zA-Z]\w*)}(.*)$/;
$line = join( '', $1 , ( $ENV{$2} || '' ) , $3 ) while $line =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/;
if ( $line =~ /^INCLUDE\s/ ) {
if ( $line =~ /^\s*INCLUDE\s/ ) {
my @line = split ' ', $line, 3;
my @line = split ' ', $line;
fatal_error "Invalid INCLUDE command: $line" if @line != 2;
fatal_error "INCLUDEs nested too deeply: $line" if @includestack >= 4;