mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 09:47:51 +02:00
Open files before generating any output
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6730 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
265170ff66
commit
0a06ba5275
@ -29,6 +29,8 @@
|
|||||||
use strict;
|
use strict;
|
||||||
use lib '/usr/share/shorewall-perl';
|
use lib '/usr/share/shorewall-perl';
|
||||||
use Shorewall::Config qw( open_file
|
use Shorewall::Config qw( open_file
|
||||||
|
push_open
|
||||||
|
pop_open
|
||||||
read_a_line1
|
read_a_line1
|
||||||
split_line
|
split_line
|
||||||
fatal_error
|
fatal_error
|
||||||
@ -73,6 +75,12 @@ set_config_path( '/etc' );
|
|||||||
our $dir = $ARGV[0] || '/etc';
|
our $dir = $ARGV[0] || '/etc';
|
||||||
|
|
||||||
$dir =~ s|/+$|| unless $dir eq '/';
|
$dir =~ s|/+$|| unless $dir eq '/';
|
||||||
|
#
|
||||||
|
# Open the files before we do anything else
|
||||||
|
#
|
||||||
|
open_file "$dir/services" or fatal_error "$dir/services is empty";
|
||||||
|
|
||||||
|
push_open "$dir/protocols" or fatal_error "$dir/protocols is empty";
|
||||||
|
|
||||||
our $date = localtime;
|
our $date = localtime;
|
||||||
|
|
||||||
@ -120,8 +128,6 @@ our $VERSION = '1.00';
|
|||||||
our %protocols = (
|
our %protocols = (
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
open_file "$dir/protocols" or fatal_error "Cannot open $dir/protocols: $!";
|
|
||||||
|
|
||||||
while ( read_a_line1 ) {
|
while ( read_a_line1 ) {
|
||||||
my ( $proto1, $number, @aliases ) = split_line( 2, 10, '/etc/protocols entry');
|
my ( $proto1, $number, @aliases ) = split_line( 2, 10, '/etc/protocols entry');
|
||||||
|
|
||||||
@ -133,12 +139,12 @@ while ( read_a_line1 ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pop_open;
|
||||||
|
|
||||||
print "\t\t );\n\n";
|
print "\t\t );\n\n";
|
||||||
|
|
||||||
print "our %services = (\n";
|
print "our %services = (\n";
|
||||||
|
|
||||||
open_file "$dir/services" or fatal_error "Cannot open $dir/services: $!";
|
|
||||||
|
|
||||||
while ( read_a_line1 ) {
|
while ( read_a_line1 ) {
|
||||||
my ( $name1, $proto_number, @names ) = split_line( 2, 10, '/etc/services entry');
|
my ( $name1, $proto_number, @names ) = split_line( 2, 10, '/etc/services entry');
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user