extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-02 10:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

?IF improvements

Browse Source 
- Pass line number to make process_conditional more general
- Add debugging output
- Do first_line processing prior to looking for ?

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-19 12:51:22 -07:00
parent 0063de1564
commit 8803cd8d3b
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1525,8 +1525,10 @@ sub close_file() {
} }
} }
sub process_conditional( $$ ) { sub process_conditional( $$$ ) {
my ( $omitting, $line ) = @_; my ( $omitting, $line, $linenumber ) = @_;
print "CD===> $currentline\n" if $debug;
fatal_error "Invalid compiler directive ($line)" unless $line =~ /^\s*\?(IF\s+|ELSE|ENDIF)(.*)$/; fatal_error "Invalid compiler directive ($line)" unless $line =~ /^\s*\?(IF\s+|ELSE|ENDIF)(.*)$/;
@ -1542,7 +1544,7 @@ sub process_conditional( $$ ) {
fatal_error "Invalid IF variable ($rest)" unless ($rest =~ s/^\$// || $rest =~ /^__/ ) && $rest =~ /^\w+$/; fatal_error "Invalid IF variable ($rest)" unless ($rest =~ s/^\$// || $rest =~ /^__/ ) && $rest =~ /^\w+$/;
push @ifstack, [ 'IF', $lastomit, $omitting, $currentlinenumber ]; push @ifstack, [ 'IF', $lastomit, $omitting, $linenumber ];
if ( $rest eq '__IPV6' ) { if ( $rest eq '__IPV6' ) {
$omitting = $family == F_IPV4; $omitting = $family == F_IPV4;
@ -2094,20 +2096,6 @@ sub read_a_line(;$$$) {
# #
$currentline = '', $currentlinenumber = 0, next if $currentline =~ /^\s*$/; $currentline = '', $currentlinenumber = 0, next if $currentline =~ /^\s*$/;
# #
# Line not blank -- Handle conditionals
#
if ( $currentline =~ /^\s*\?/ ) {
$omitting = process_conditional( $omitting, $currentline);
$currentline='';
next;
}
if ( $omitting ) {
progress_message " OMITTED: $currentline";
$currentline='';
next;
}
#
# Line not blank -- Handle any first-entry message/capabilities check # Line not blank -- Handle any first-entry message/capabilities check
# #
if ( $first_entry ) { if ( $first_entry ) {
@ -2119,6 +2107,20 @@ sub read_a_line(;$$$) {
$first_entry = 0; $first_entry = 0;
} }
# #
# Handle conditionals
#
if ( $currentline =~ /^\s*\?/ ) {
$omitting = process_conditional( $omitting, $currentline, $currentlinenumber );
$currentline='';
next;
}
if ( $omitting ) {
print "OMIT=> $currentline\n" if $debug;
$currentline='';
next;
}
#
# Must check for shell/perl before doing variable expansion # Must check for shell/perl before doing variable expansion
# #
if ( $embedded_enabled ) { if ( $embedded_enabled ) {