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

A little Easter Morning hacking

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5859 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-08 14:35:31 +00:00
parent 3b26b746c2
commit d19dac49d0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall-perl/Shorewall/Config.pm
View File

@ -281,8 +281,6 @@ my %no_pad = ( COMMENT => 1,
#
# Pre-process a line from a configuration file.
# chomp it.
# compress out redundent white space.
# ensure that it has an appropriate number of columns.
# supply '-' in omitted trailing columns.
#
@ -340,6 +338,10 @@ sub close_file() {
}
}
#
# The following two functions allow module clients to nest opens. This happens frequently
# in the Actions module.
#
sub push_open( $ ) {
push @includestack, [ $currentfile, $currentfilename, $currentlinenumber ];
@ -364,7 +366,7 @@ sub pop_open() {
}
#
# Read a line from the current open stack.
# Read a line from the current include stack.
#
# - Ignore blank or comment-only lines.
# - Remove trailing comments.
@ -386,13 +388,11 @@ sub read_a_line {
#
# Continuation
#
if ( substr( $nextline, -1, 1 ) eq '\\' ) {
$line .= substr( $nextline, 0, -1 );
if ( substr( ( $line .= $nextline ), -1, 1 ) eq '\\' ) {
$line = substr( $line, 0, -1 );
next;
}
$line .= $nextline;
$line =~ s/#.*$//; # Remove Trailing Comments -- result might be a blank line
#
# Ignore ( concatenated ) Blank Lines
@ -415,8 +415,7 @@ sub read_a_line {
my @line = split /\s+/, $line;
fatal_error "Missing file name after 'INCLUDE'" unless @line > 1;
fatal_error "Invalid INCLUDE command: $line" if @line > 2;
fatal_error "Invalid INCLUDE command: $line" if @line != 2;
fatal_error "INCLUDEs nested too deeply: $line" if @includestack >= 4;
my $filename = find_file $line[1];