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

Cleanup of column splitting change.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-12-01 09:24:49 -08:00
parent bf44e514e3
commit 75258083e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1982,7 +1982,7 @@ sub split_list3( $$ ) {
@list2; @list2;
} }
sub split_list4( $ ) { sub split_columns( $ ) {
my ($list) = @_; my ($list) = @_;
return split ' ', $list unless $list =~ /\(/; return split ' ', $list unless $list =~ /\(/;
@ -2008,7 +2008,7 @@ sub split_list4( $ ) {
push @list2 , $element; push @list2 , $element;
$element = ''; $element = '';
} else { } else {
fatal_error "Mismatched parentheses ($list)" if $opencount < 0; fatal_error "Mismatched parentheses ($_)" if $opencount < 0;
} }
} }
} elsif ( ( $count = tr/)/)/ ) > 0 ) { } elsif ( ( $count = tr/)/)/ ) > 0 ) {
@ -2017,7 +2017,7 @@ sub split_list4( $ ) {
push @list2 , $element; push @list2 , $element;
$element = ''; $element = '';
} else { } else {
fatal_error "Mismatched parentheses ($list)" if $opencount < 0; fatal_error "Mismatched parentheses ($_)" if $opencount < 0;
} }
} elsif ( $element eq '' ) { } elsif ( $element eq '' ) {
push @list2 , $_; push @list2 , $_;
@ -2096,7 +2096,7 @@ sub split_line1( $$;$$ ) {
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/; fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/;
fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/; fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/;
my @line = split_list4( $columns ); my @line = split_columns( $columns );
$nopad = {} unless $nopad; $nopad = {} unless $nopad;