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

Add $file_format exported variable and handle in the include stack.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-21 15:14:23 -08:00
parent 7abebb72e4
commit a5debe793f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
$currentline $currentline
$currentfilename $currentfilename
$debug $debug
$file_format
%config %config
%globals %globals
%config_files %config_files
@ -483,6 +484,7 @@ my $perlscriptname; # Name of that file.
my $embedded; # True if we're in an embedded perl script my $embedded; # True if we're in an embedded perl script
my @tempfiles; # Files that need unlinking at END my @tempfiles; # Files that need unlinking at END
my $first_entry; # Message to output or function to call on first non-blank line of a file my $first_entry; # Message to output or function to call on first non-blank line of a file
our $file_format; # Format of configuration file.
my $shorewall_dir; # Shorewall Directory; if non-empty, search here first for files. my $shorewall_dir; # Shorewall Directory; if non-empty, search here first for files.
@ -1921,6 +1923,7 @@ sub open_file( $ ) {
if ( -f $fname && -s _ ) { if ( -f $fname && -s _ ) {
$first_entry = 0; $first_entry = 0;
$file_format = 1;
do_open_file $fname;; do_open_file $fname;;
} else { } else {
$ifstack = @ifstack; $ifstack = @ifstack;
@ -1941,7 +1944,7 @@ sub pop_include() {
} }
if ( $arrayref ) { if ( $arrayref ) {
( $currentfile, $currentfilename, $currentlinenumber, $ifstack ) = @$arrayref; ( $currentfile, $currentfilename, $currentlinenumber, $ifstack, $file_format ) = @$arrayref;
} else { } else {
$currentfile = undef; $currentfile = undef;
$currentlinenumber = 'EOF'; $currentlinenumber = 'EOF';
@ -2423,7 +2426,7 @@ EOF
# #
sub push_open( $ ) { sub push_open( $ ) {
push @includestack, [ $currentfile, $currentfilename, $currentlinenumber, $ifstack ] if $currentfile; push @includestack, [ $currentfile, $currentfilename, $currentlinenumber, $ifstack, $file_format ] if $currentfile;
my @a = @includestack; my @a = @includestack;
push @openstack, \@a; push @openstack, \@a;
@includestack = (); @includestack = ();