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

Cleanup of read_a_line()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-09 16:00:26 -07:00
parent 7b511f449f
commit 2545322163
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2182,18 +2182,14 @@ sub read_a_line(;$$$$) {
# #
s/^\s*// if $currentline =~ /[,:]$/ && $suppress_whitespace; s/^\s*// if $currentline =~ /[,:]$/ && $suppress_whitespace;
# #
# If this isn't a continued line, remove trailing comments. Note that # If this is a continued line with a trailing comment, remove comment. Note that
# the result may now end in '\'. # the result will now end in '\'.
# #
s/\s*#.*$// if $strip_comments && /[\\]\s*#.*$/; s/\s*#.*$// if $strip_comments && /[\\]\s*#.*$/;
# #
# Continuation # Continuation
# #
chop $currentline, next if substr( ( $currentline .= $_ ), -1, 1 ) eq '\\'; chop $currentline, next if ($currentline .= $_) =~ /\\$/;
#
# Ignore ( concatenated ) Blank Lines
#
$currentline = '', $currentlinenumber = 0, next if $currentline =~ /^\s*$/ && $suppress_whitespace;
# #
# Handle conditionals # Handle conditionals
# #
@ -2237,8 +2233,6 @@ sub read_a_line(;$$$$) {
# Line not blank -- Handle any first-entry message/capabilities check # Line not blank -- Handle any first-entry message/capabilities check
# #
handle_first_entry if $first_entry; handle_first_entry if $first_entry;
my $count = 0;
# #
# Expand Shell Variables using %params and @actparms # Expand Shell Variables using %params and @actparms
# #