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

Don't suppress whitespace in embedded Perl and Shell

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-08 07:54:03 -07:00
parent 860141127a
commit 50405f57ba
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1939,7 +1939,7 @@ sub first_entry( $ ) {
} }
} }
sub read_a_line(;$$$); sub read_a_line(;$$$$);
sub embedded_shell( $ ) { sub embedded_shell( $ ) {
my $multiline = shift; my $multiline = shift;
@ -1956,7 +1956,7 @@ sub embedded_shell( $ ) {
my $last = 0; my $last = 0;
while ( read_a_line( 0, 0, 0 ) ) { while ( read_a_line( 0, 0, 0, 0 ) ) {
last if $last = $currentline =~ s/^\s*END(\s+SHELL)?\s*;?//; last if $last = $currentline =~ s/^\s*END(\s+SHELL)?\s*;?//;
$command .= $currentline; $command .= $currentline;
} }
@ -1990,7 +1990,7 @@ sub embedded_perl( $ ) {
my $last = 0; my $last = 0;
while ( read_a_line( 0, 0, 0 ) ) { while ( read_a_line( 0, 0, 0, 0 ) ) {
last if $last = $currentline =~ s/^\s*END(\s+PERL)?\s*;?//; last if $last = $currentline =~ s/^\s*END(\s+PERL)?\s*;?//;
$command .= $currentline; $command .= $currentline;
} }
@ -2145,10 +2145,11 @@ sub expand_variables( \$ ) {
# - Handle ?IF, ?ELSE, ?ENDIF # - Handle ?IF, ?ELSE, ?ENDIF
# #
sub read_a_line(;$$$) { sub read_a_line(;$$$$) {
my $embedded_enabled = defined $_[0] ? shift : 1; my $embedded_enabled = defined $_[0] ? shift : 1;
my $expand_variables = defined $_[0] ? shift : 1; my $expand_variables = defined $_[0] ? shift : 1;
my $strip_comments = defined $_[0] ? shift : 1; my $strip_comments = defined $_[0] ? shift : 1;
my $suppress_whitespace = defined $_[0] ? shift : 1;
while ( $currentfile ) { while ( $currentfile ) {
@ -2163,7 +2164,7 @@ sub read_a_line(;$$$) {
# #
# Suppress leading whitespace in certain continuation lines # Suppress leading whitespace in certain continuation lines
# #
s/^\s*// if $currentline =~ /[,:]$/; s/^\s*// if $currentline =~ /[,:]$/ && $suppress_whitespace;
# #
# If this isn't a continued line, remove trailing comments. Note that # If this isn't a continued line, remove trailing comments. Note that
# the result may now end in '\'. # the result may now end in '\'.
@ -2180,7 +2181,7 @@ sub read_a_line(;$$$) {
# #
# Ignore ( concatenated ) Blank Lines # Ignore ( concatenated ) Blank Lines
# #
$currentline = '', $currentlinenumber = 0, next if $currentline =~ /^\s*$/; $currentline = '', $currentlinenumber = 0, next if $currentline =~ /^\s*$/ && $suppress_whitespace;
# #
# Line not blank -- Handle any first-entry message/capabilities check # Line not blank -- Handle any first-entry message/capabilities check
# #