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

Use read_a_line() in the embedded_shell() and embedded_perl() functions.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-06 15:46:01 -07:00
parent f85321e201
commit 9dd6f86c55
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1952,10 +1952,9 @@ sub embedded_shell( $ ) {
my $last = 0;
while ( <$currentfile> ) {
$currentlinenumber++;
last if $last = s/^\s*\??END(\s+SHELL)?\s*;?//;
$command .= $_;
while ( read_a_line( 0, 0, 1 ) ) {
last if $last = $currentline =~ s/^\s*\??END(\s+SHELL)?\s*;?//;
$command .= $currentline;
}
fatal_error ( "Missing END SHELL" ) unless $last;
@ -1973,6 +1972,8 @@ sub embedded_shell( $ ) {
$ifstack = @ifstack;
}
sub read_a_line(;$$$);
sub embedded_perl( $ ) {
my $multiline = shift;
@ -1987,10 +1988,9 @@ sub embedded_perl( $ ) {
my $last = 0;
while ( <$currentfile> ) {
$currentlinenumber++;
last if $last = s/^\s*\??END(\s+PERL)?\s*;?//;
$command .= $_;
while ( read_a_line( 0, 0, 1 ) ) {
last if $last = $currentline =~ s/^\s*\??END(\s+PERL)?\s*;?//;
$command .= $currentline;
}
fatal_error ( "Missing END PERL" ) unless $last;