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

Minor tweaks to Config.pm

Browse Source 
- Look for unprintable gunk in lines processed by split_line1()
- Modify a comment
- replace awkward close/assert statement

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-07-02 08:10:43 -07:00
parent bd9bf3d43a
commit afa5ea3fd2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1343,6 +1343,7 @@ sub split_line1( $$$;$ ) {
my ( $mincolumns, $maxcolumns, $description, $nopad) = @_; my ( $mincolumns, $maxcolumns, $description, $nopad) = @_;
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $currentline =~ /["`\\]/; fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $currentline =~ /["`\\]/;
fatal_error "Non-ASCII gunk in file" if $currentline =~ /[^\s[:print:]]/;
my @line = split( ' ', $currentline ); my @line = split( ' ', $currentline );
@ -1427,7 +1428,7 @@ sub close_file() {
} }
# #
# Functions for copying files into the script # Functions for copying a file into the script
# #
sub copy( $ ) { sub copy( $ ) {
assert( $script_enabled ); assert( $script_enabled );
@ -1779,7 +1780,7 @@ sub embedded_perl( $ ) {
if ( $perlscript ) { if ( $perlscript ) {
fatal_error "INCLUDEs nested too deeply" if @includestack >= 4; fatal_error "INCLUDEs nested too deeply" if @includestack >= 4;
close $perlscript or assert(0); assert( close $perlscript );
$perlscript = undef; $perlscript = undef;