extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 20:30:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Control the proliferation of arguments to read_a_line() by using

Browse Source 
a bit-mapped single argument.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-10 13:51:25 -07:00
parent 25125c47e4
commit 5ee554708c
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,6 +150,11 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
MIN_VERBOSITY
MAX_VERBOSITY
EMBEDDED_ENABLED
EXPAND_VARIABLES
STRIP_COMMENTS
SUPPRESS_WHITESPACE
) ] );
Exporter::export_ok_tags('internal');
@ -438,6 +443,13 @@ my $ifstack;
# From .shorewallrc
#
our %shorewallrc;
#
# read_a_line flags
#
use constant { EMBEDDED_ENABLED => 1,
EXPAND_VARIABLES => 2,
STRIP_COMMENTS => 4,
SUPPRESS_WHITESPACE => 8 };
sub process_shorewallrc($);
#
@ -1943,7 +1955,7 @@ sub first_entry( $ ) {
}
}
sub read_a_line(;$$$$);
sub read_a_line(;$);
sub embedded_shell( $ ) {
my $multiline = shift;
@ -1960,7 +1972,7 @@ sub embedded_shell( $ ) {
my $last = 0;
while ( read_a_line( 0, 0, 0, 0 ) ) {
while ( read_a_line( 0 ) ) {
last if $last = $currentline =~ s/^\s*END(\s+SHELL)?\s*;?//;
$command .= "$currentline\n";
}
@ -1994,7 +2006,7 @@ sub embedded_perl( $ ) {
my $last = 0;
while ( read_a_line( 0, 0, 0, 0 ) ) {
while ( read_a_line( 0 ) ) {
last if $last = $currentline =~ s/^\s*END(\s+PERL)?\s*;?//;
$command .= "$currentline\n";
}
@ -2161,11 +2173,12 @@ sub handle_first_entry() {
# - Handle ?IF, ?ELSE, ?ENDIF
#
sub read_a_line(;$$$$) {
my $embedded_enabled = defined $_[0] ? shift : 1;
my $expand_variables = defined $_[0] ? shift : 1;
my $strip_comments = defined $_[0] ? shift : 1;
my $suppress_whitespace = defined $_[0] ? shift : 1;
sub read_a_line(;$) {
my $flags = defined $_[0] ? $_[0] : 0xffff;
my $embedded_enabled = $flags & EMBEDDED_ENABLED;
my $expand_variables = $flags & EXPAND_VARIABLES;
my $strip_comments = $flags & STRIP_COMMENTS;
my $suppress_whitespace = $flags & SUPPRESS_WHITESPACE;
while ( $currentfile ) {

2
Shorewall/Perl/Shorewall/Misc.pm
View File

@ -346,7 +346,7 @@ sub remove_blacklist( $ ) {
open $newfile, '>', "$fn.new" or fatal_error "Unable to open $fn.new for output: $!";
while ( read_a_line(1,1,0) ) {
while ( read_a_line( EMBEDDED_ENABLED + EXPAND_VARIABLES ) ) {
my ( $rule, $comment ) = split '#', $currentline, 2;
if ( $rule =~ /blacklist/ ) {