holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Cleanup of ERROR/WARNING message enhancement.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-05-04 07:01:08 -07:00
parent 097ab853db
commit 1d90ee174c
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,22 +808,33 @@ my @abbr = qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec );
# Create 'currentlineinfo' # Create 'currentlineinfo'
# #
sub currentlineinfo() { sub currentlineinfo() {
my $linenumber = $currentlinenumber || 1;
if ( $currentfile ) { if ( $currentfile ) {
my $lineinfo = " $currentfilename "; my $lineinfo = @includestack || @openstack ? "\n $currentfilename " : " $currentfilename ";
if ( $currentlinenumber eq 'EOF' ) { if ( $linenumber eq 'EOF' ) {
$lineinfo .= '(EOF)' $lineinfo .= '(EOF)'
} else { } else {
$currentlinenumber ||= 1; $lineinfo .= "(line $linenumber)";
$lineinfo .= "(line $currentlinenumber)"; }
#
for ( my $i = @openstack - 1; $i >= 0; $i-- ) { # Unwind the current include stack
my $istack = $openstack[$i]; #
for ( my $i = @includestack - 1; $i >= 0; $i-- ) {
for ( my $j = ( @$istack - 1 ); $j >= 0; $j-- ) { my $info = $includestack[$i];
my $info = $istack->[$j]; $linenumber = $info->[2] || 1;
$lineinfo .= "\n from $info->[1] (line $info->[2])"; $lineinfo .= "\n from $info->[1] (line $linenumber)";
} }
#
# Now unwind the open stack; each element is an include stack
#
for ( my $i = @openstack - 1; $i >= 0; $i-- ) {
my $istack = $openstack[$i];
for ( my $j = ( @$istack - 1 ); $j >= 0; $j-- ) {
my $info = $istack->[$j];
$linenumber = $info->[2] || 1;
$lineinfo .= "\n from $info->[1] (line $linenumber)";
} }
} }
@ -894,7 +905,6 @@ sub cleanup() {
# Issue fatal error message and die # Issue fatal error message and die
# #
sub fatal_error { sub fatal_error {
my $linenumber = $currentlinenumber || 1;
my $currentlineinfo = currentlineinfo; my $currentlineinfo = currentlineinfo;
$| = 1; #Reset output buffering (flush any partially filled buffers). $| = 1; #Reset output buffering (flush any partially filled buffers).