holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Add bug-catcher to get_params()

Browse Source
This commit is contained in:
Tom Eastep 2010-12-03 08:05:11 -08:00
parent 04537b8f2d
commit 8ce1755f8e
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
Exporter::export_ok_tags('internal'); Exporter::export_ok_tags('internal');
our $VERSION = '4.4_15'; our $VERSION = '4.4_16';
# #
# describe the current command, it's present progressive, and it's completion. # describe the current command, it's present progressive, and it's completion.
@ -2888,6 +2888,16 @@ sub unsupported_yes_no_warning( $ ) {
# #
# Process the params file # Process the params file
# #
sub get_params_bug( \@$ ) {
my ( $params, $element ) = @_;
warning_message "Bug in get_params()";
print STDERR "Params\n";
print STDERR $_ for @$params;
print STDERR "\nElement in error:\n";
print STDERR "$element\n";
}
sub get_params() { sub get_params() {
my $fn = find_file 'params'; my $fn = find_file 'params';
@ -2902,7 +2912,7 @@ sub get_params() {
fatal_error "Processing of $fn failed" if $?; fatal_error "Processing of $fn failed" if $?;
my $variable; my ( $variable , $bug );
if ( $params[0] =~ /^declare/ ) { if ( $params[0] =~ /^declare/ ) {
# #
@ -2921,9 +2931,12 @@ sub get_params() {
} elsif ( /^declare -x (.*)\s+$/ || /^declare -x (.*)=""$/ ) { } elsif ( /^declare -x (.*)\s+$/ || /^declare -x (.*)=""$/ ) {
$params{$1} = ''; $params{$1} = '';
} else { } else {
assert($variable); if ($variable) {
s/'$//; s/'$//;
$params{$variable} .= $_; $params{$variable} .= $_;
} else {
get_params_bug( @params, $_ ) unless $bug++;
}
} }
} }
} else { } else {
@ -2942,9 +2955,12 @@ sub get_params() {
} elsif ( /^export (.*?)='(.*)$/ ) { } elsif ( /^export (.*?)='(.*)$/ ) {
$params{$variable=$1}="${2}\n"; $params{$variable=$1}="${2}\n";
} else { } else {
assert($variable); if ($variable) {
s/'$//; s/'$//;
$params{$variable} .= $_; $params{$variable} .= $_;
} else {
get_params_bug( @params , $_ ) unless $bug++;
}
} }
} }
} }