extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some variable expansion optimization

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5483 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-10 05:21:36 +00:00
parent 2adac27806
commit b235c3b53d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
New/compiler.pl
View File

@ -3433,28 +3433,23 @@ sub finish_section ( $ ) {
} }
} }
sub process_rule1 ( $$$$$$$$$ );
# #
# Macros and actions can have shell variables embedded. This function expands them. # Macro and action files can have shell variables embedded. This function expands them from %ENV.
# #
sub expand_shell_variables( $ ) { sub expand_shell_variables( $ ) {
my $line = $_[0]; my $line = $_[0]; $line = $1 . ( $ENV{$2} || '' ) . $3 while $line =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/; $line;
while ( $line =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/ ) {
warning_message "Shell variable \$$2 not found" unless $ENV{$2};
$line = $1 . $ENV{$2} . $3 ;
}
$line;
} }
sub process_rule1 ( $$$$$$$$$ );
# #
# Expand a macro rule from the rules file # Expand a macro rule from the rules file
# #
sub process_macro ( $$$$$$$$$$$ ) { sub process_macro ( $$$$$$$$$$$ ) {
my ($macrofile, $target, $param, $source, $dest, $proto, $ports, $sports, $origdest, $rate, $user) = @_; my ($macrofile, $target, $param, $source, $dest, $proto, $ports, $sports, $origdest, $rate, $user) = @_;
my $standard = ( $macrofile =~ /^($env{SHAREDIR})/ );
progress_message "..Expanding Macro $macrofile..."; progress_message "..Expanding Macro $macrofile...";
open M, $macrofile or fatal_error "Unable to open $macrofile: $!"; open M, $macrofile or fatal_error "Unable to open $macrofile: $!";
@ -3465,7 +3460,7 @@ sub process_macro ( $$$$$$$$$$$ ) {
next if $line =~ /^\s*$/; next if $line =~ /^\s*$/;
$line =~ s/\s+/ /g; $line =~ s/\s+/ /g;
$line =~ s/#.*$//; $line =~ s/#.*$//;
$line = expand_shell_variables $line unless $macrofile =~ /^($env{SHAREDIR})/; $line = expand_shell_variables $line unless $standard;
my ( $mtarget, $msource, $mdest, $mproto, $mports, $msports, $mrate, $muser ) = split /\s+/, $line; my ( $mtarget, $msource, $mdest, $mproto, $mports, $msports, $mrate, $muser ) = split /\s+/, $line;
@ -4210,6 +4205,7 @@ sub process_action( $$$$$$$$$$ ) {
sub process_action3( $$$$$ ) { sub process_action3( $$$$$ ) {
my ( $chainref, $wholeaction, $action, $level, $tag ) = @_; my ( $chainref, $wholeaction, $action, $level, $tag ) = @_;
my $actionfile = find_file "action.$action"; my $actionfile = find_file "action.$action";
my $standard = ( $actionfile =~ /^($env{SHAREDIR})/ );
fatal_error "Missing Action File: $actionfile" unless -f $actionfile; fatal_error "Missing Action File: $actionfile" unless -f $actionfile;
@ -4223,7 +4219,7 @@ sub process_action3( $$$$$ ) {
next if $line =~ /^\s*$/; next if $line =~ /^\s*$/;
$line =~ s/\s+/ /g; $line =~ s/\s+/ /g;
$line =~ s/#.*$//; $line =~ s/#.*$//;
$line = expand_shell_variables $line unless $actionfile =~ /^($env{SHAREDIR})/; $line = expand_shell_variables $line unless $standard;
my ($target, $source, $dest, $proto, $ports, $sports, $rate, $user , $extra ) = split /\s+/, $line; my ($target, $source, $dest, $proto, $ports, $sports, $rate, $user , $extra ) = split /\s+/, $line;
@ -4257,12 +4253,14 @@ sub process_action3( $$$$$ ) {
open M, $fn or fatal_error "Can't open $fn: $!"; open M, $fn or fatal_error "Can't open $fn: $!";
my $standard = ( $fn =~ /^($env{SHAREDIR})/ );
while ( $line = <M> ) { while ( $line = <M> ) {
next if $line =~ /^\s*#/; next if $line =~ /^\s*#/;
next if $line =~ /^\s*$/; next if $line =~ /^\s*$/;
$line =~ s/\s+/ /g; $line =~ s/\s+/ /g;
$line =~ s/#.*$//; $line =~ s/#.*$//;
$line = expand_shell_variables $line unless $actionfile =~ /^($env{SHAREDIR})/; $line = expand_shell_variables $line unless $standard;
my ( $mtarget, $msource, $mdest, $mproto, $mports, $msports, $mrate, $muser ) = split /\s+/, $line; my ( $mtarget, $msource, $mdest, $mproto, $mports, $msports, $mrate, $muser ) = split /\s+/, $line;