extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-03-08 11:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks to Config.pm

Browse Source 
- Add/revise comments
- Rename $line -> $lineref in expand_variables()
- Collapse 3 lines into one in process_shorewall_conf()
This commit is contained in:
Tom Eastep 2011-06-26 06:50:22 -07:00
parent 7507c81882
commit 0b431aa8c1
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1852,12 +1852,12 @@ sub set_action_param( $$ ) {
} }
# #
# Expand shell variables and action parameters in the passed scalar # Expand Shell Variables in the passed buffer using %params and @actparms
# #
sub expand_variables( \$ ) { sub expand_variables( \$ ) {
my ( $line, $count ) = ( $_[0], 0 ); my ( $lineref, $count ) = ( $_[0], 0 );
# $1 $2 $3 - $4 # $1 $2 $3 - $4
while ( $$line =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) { while ( $$lineref =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) {
my ( $first, $var, $rest ) = ( $1, $3, $4); my ( $first, $var, $rest ) = ( $1, $3, $4);
@ -1872,7 +1872,7 @@ sub expand_variables( \$ ) {
} }
$val = '' unless defined $val; $val = '' unless defined $val;
$$line = join( '', $first , $val , $rest ); $$lineref = join( '', $first , $val , $rest );
fatal_error "Variable Expansion Loop" if ++$count > 100; fatal_error "Variable Expansion Loop" if ++$count > 100;
} }
} }
@ -3037,19 +3037,17 @@ sub process_shorewall_conf( $$ ) {
first_entry "Processing $file..."; first_entry "Processing $file...";
# #
# Don't expand shell variables if $config # Don't expand shell variables if $update
# #
while ( read_a_line( 0,! $update ) ) { while ( read_a_line( 0,! $update ) ) {
if ( $currentline =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) { if ( $currentline =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
my ($var, $val) = ($1, $2); my ($var, $val) = ($1, $2);
unless ( exists $config{$var} ) {
warning_message "Unknown configuration option ($var) ignored"; warning_message "Unknown configuration option ($var) ignored", next unless exists $config{$var};
next;
}
$config{$var} = ( $val =~ /\"([^\"]*)\"$/ ? $1 : $val ); $config{$var} = ( $val =~ /\"([^\"]*)\"$/ ? $1 : $val );
} else { } else {
fatal_error "Unrecognized entry"; fatal_error "Unrecognized $product.conf entry";
} }
} }
} else { } else {
@ -3064,7 +3062,10 @@ sub process_shorewall_conf( $$ ) {
# #
if ( $update ) { if ( $update ) {
update_config_file( $annotate) if $update; update_config_file( $annotate) if $update;
#
# Config file update requires that the option values not have
# Shell variables expanded. We do that now.
#
supplied $_ && expand_variables( $_ ) for values %config; supplied $_ && expand_variables( $_ ) for values %config;
} }