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

Continue to enhance params procesing

Browse Source
This commit is contained in:
Tom Eastep 2010-12-01 13:18:10 -08:00
parent 627733d925
commit d33491d6c6
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,17 +712,11 @@ sub initialize( $ ) {
$debug = 0; $debug = 0;
%params = (); %params = ( root => '',
} system => '',
command => '',
INIT { files => '',
# destination => '' );
# These variables appear within single quotes in shorewall.conf -- add them to ENV
# so that read_a_line doesn't have to be smart enough to parse that usage.
#
for ( qw/root system command files destination/ ) {
$ENV{$_} = '' unless exists $ENV{$_};
}
} }
my @abbr = qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ); my @abbr = qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec );
@ -2909,11 +2903,11 @@ sub get_params() {
if ( $params[0] =~ /^declare/ ) { if ( $params[0] =~ /^declare/ ) {
for ( @params ) { for ( @params ) {
if ( /^declare -x (.*?)="(.*)"$/ ) { if ( /^declare -x (.*?)="(.*[^\\])"$/ ) {
$params{$1} = $2 unless $1 eq '_'; $params{$1} = $2 unless $1 eq '_';
} elsif ( /^declare -x (.*?)="(.*)$/ ) { } elsif ( /^declare -x (.*?)="(.*)$/ ) {
$params{$variable=$1}="${2}\n"; $params{$variable=$1}="${2}\n";
} elsif ( /^declare -x (.*)\s+$/ ) { } elsif ( /^declare -x (.*)\s+$/ || /^declare -x (.*)=""/ ) {
$params{$1} = ''; $params{$1} = '';
} else { } else {
assert($variable); assert($variable);