changed all instances of FileHandle to IO::File

diff --git a/Changes b/Changes
index a57bf25be5f95e0fd04c917c194e896cac87b61f..85b364f5e9464b245c604db0433b53f61735ad46 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,6 +5,7 @@ appropriate.
 also reformat PC19 for onward broadcast so that nodes coming in on loops are
 dropped from those broadcasts.
 3. make sure PC16,17,19,21 doen't affect locally connected nodes.
 also reformat PC19 for onward broadcast so that nodes coming in on loops are
 dropped from those broadcasts.
 3. make sure PC16,17,19,21 doen't affect locally connected nodes.

+4. Changed all instances of FileHandle to IO::File.

 01Jun99=======================================================================
 1. removed a output of an unwanted pc21 for isolated nodes
 31May99=======================================================================
 01Jun99=======================================================================
 1. removed a output of an unwanted pc21 for isolated nodes
 31May99=======================================================================

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 331ca00e0d51b08042e36f05014a478f0b7829b0..24d3f0a9597fe475c2e178290fe1b2f3e2e3d17f 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -21,7 +21,7 @@ use DXLog;
 use DXLogPrint;
 use DXBearing;
 use CmdAlias;
 use DXLogPrint;
 use DXBearing;
 use CmdAlias;

-use FileHandle;
+use IO::File;

 use Filter;
 use Carp;
 
 use Filter;
 use Carp;
 


@@ -509,7 +509,7 @@ sub find_cmd_name {
        } else {
                delete_package($package) if defined $Cache{$package}{mtime};
                
        } else {
                delete_package($package) if defined $Cache{$package}{mtime};
                

-               my $fh = new FileHandle;
+               my $fh = new IO::File;

                if (!open $fh, $filename) {
                        $errstr = "Syserr: can't open '$filename' $!";
                        return undef;
                if (!open $fh, $filename) {
                        $errstr = "Syserr: can't open '$filename' $!";
                        return undef;

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 94c1cad0450573d6399a08fdc5ab3c4c9c57515b..c0565fa1e9e8268b2c3c8aed8719398227f91409 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -12,7 +12,7 @@ use DXVars;
 use DXUtil;
 use DXM;
 use DXDebug;
 use DXUtil;
 use DXM;
 use DXDebug;

-use FileHandle;
+use IO::File;

 use Carp;
 
 use strict;
 use Carp;
 
 use strict;


@@ -58,7 +58,7 @@ sub init
 sub cread
 {
        my $fn = shift;
 sub cread
 {
        my $fn = shift;

-       my $fh = new FileHandle;
+       my $fh = new IO::File;

        my $line = 0;
 
        dbg('cron', "cron: reading $fn\n");
        my $line = 0;
 
        dbg('cron', "cron: reading $fn\n");

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index df3cb02741cef0d31b606a411358cfa4a3376de9..632602313238c659c416fdafb1a5cb8163833efa 100644 (file)
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -17,7 +17,6 @@ require Exporter;
 use strict;
 use vars qw(%dbglevel $fp);
 
 use strict;
 use vars qw(%dbglevel $fp);
 

-use FileHandle;

 use DXUtil;
 use DXLog ();
 use Carp;
 use DXUtil;
 use DXLog ();
 use Carp;

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index f089d73d0cecc28058bfd975eaf47df79d207ab5..8281e154e86f6998ecbc25d48d5652de9be76c28 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -29,7 +29,7 @@ require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(Log Logclose);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(Log Logclose);
 

-use FileHandle;
+use IO::File;

 use DXVars;
 use DXDebug ();
 use DXUtil;
 use DXVars;
 use DXDebug ();
 use DXUtil;


@@ -75,7 +75,7 @@ sub open
        $mode = 'r' if !$mode;
        $self->{mode} = $mode;
        
        $mode = 'r' if !$mode;
        $self->{mode} = $mode;
        

-       my $fh = new FileHandle $self->{fn}, $mode, 0666;
+       my $fh = new IO::File $self->{fn}, $mode, 0666;

        return undef if !$fh;
        $fh->autoflush(1) if $mode ne 'r'; # make it autoflushing if writable
        $self->{fh} = $fh;
        return undef if !$fh;
        $fh->autoflush(1) if $mode ne 'r'; # make it autoflushing if writable
        $self->{fh} = $fh;

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index 9c5633e1fbf2d3bb085d8eeec62c4bf267ebd3b5..3c0203575d978e3355bd95b41df023268080a98f 100644 (file)
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -8,7 +8,7 @@
 
 package DXLog;
 
 
 package DXLog;
 

-use FileHandle;
+use IO::File;

 use DXVars;
 use DXDebug ();
 use DXUtil;
 use DXVars;
 use DXDebug ();
 use DXUtil;

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 87129ea0ed1ce990391b2f182dbeffd6c545a93d..13af2cc02eac81e6bb85369add0fa39b3ce4a75e 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -26,7 +26,8 @@ use DXProtVars;
 use DXProtout;
 use DXDebug;
 use DXLog;
 use DXProtout;
 use DXDebug;
 use DXLog;

-use FileHandle;
+use IO::File;
+use Fcntl;

 use Carp;
 
 use strict;
 use Carp;
 
 use strict;


@@ -330,7 +331,7 @@ sub store
        if ($ref->{file}) {                     # a file
                dbg('msg', "To be stored in $ref->{to}\n");
                
        if ($ref->{file}) {                     # a file
                dbg('msg', "To be stored in $ref->{to}\n");
                

-               my $fh = new FileHandle "$ref->{to}", "w";
+               my $fh = new IO::File "$ref->{to}", "w";

                if (defined $fh) {
                        my $line;
                        foreach $line (@{$lines}) {
                if (defined $fh) {
                        my $line;
                        foreach $line (@{$lines}) {


@@ -350,7 +351,7 @@ sub store
                dbg('msg', "To be stored in $fn\n");
                
                # now save the file, overwriting what's there, YES I KNOW OK! (I will change it if it's a problem)
                dbg('msg', "To be stored in $fn\n");
                
                # now save the file, overwriting what's there, YES I KNOW OK! (I will change it if it's a problem)

-               my $fh = new FileHandle "$fn", "w";
+               my $fh = new IO::File "$fn", "w";

                if (defined $fh) {
                        my $rr = $ref->{rrreq} ? '1' : '0';
                        my $priv = $ref->{private} ? '1': '0';
                if (defined $fh) {
                        my $rr = $ref->{rrreq} ? '1' : '0';
                        my $priv = $ref->{private} ? '1': '0';


@@ -419,7 +420,7 @@ sub read_msg_header
        my @f;
        my $size;
        
        my @f;
        my $size;
        

-       $file = new FileHandle;
+       $file = new IO::File;

        if (!open($file, $fn)) {
                print "Error reading $fn $!\n";
                return undef;
        if (!open($file, $fn)) {
                print "Error reading $fn $!\n";
                return undef;


@@ -464,7 +465,7 @@ sub read_msg_body
        my $fn = filename($msgno);
        my @out;
        
        my $fn = filename($msgno);
        my @out;
        

-       $file = new FileHandle;
+       $file = new IO::File;

        if (!open($file, $fn)) {
                print "Error reading $fn $!\n";
                return undef;
        if (!open($file, $fn)) {
                print "Error reading $fn $!\n";
                return undef;


@@ -622,7 +623,7 @@ sub next_transno
        my $fn = "$msgdir/$name";
        my $msgno;
        
        my $fn = "$msgdir/$name";
        my $msgno;
        

-       my $fh = new FileHandle;
+       my $fh = new IO::File;

        if (sysopen($fh, $fn, O_RDWR|O_CREAT, 0666)) {
                $fh->autoflush(1);
                $msgno = $fh->getline;
        if (sysopen($fh, $fn, O_RDWR|O_CREAT, 0666)) {
                $fh->autoflush(1);
                $msgno = $fh->getline;


@@ -641,7 +642,7 @@ sub next_transno
 # initialise the message 'system', read in all the message headers
 sub init
 {
 # initialise the message 'system', read in all the message headers
 sub init
 {

-       my $dir = new FileHandle;
+       my $dir = new IO::File;

        my @dir;
        my $ref;
 
        my @dir;
        my $ref;
 

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index d7cdc19c12a79b8faf185f74f6e44076b282343b..225cb542f087155c84bbe7c2cd9a487dc20bbc10 100644 (file)
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -14,7 +14,7 @@ use DXVars;
 use DXUtil;
 use DXLog;
 use Julian;
 use DXUtil;
 use DXLog;
 use Julian;

-use FileHandle;
+use IO::File;

 use Carp;
 
 use strict;
 use Carp;
 
 use strict;


@@ -44,7 +44,7 @@ sub init
 # write the current data away
 sub store
 {
 # write the current data away
 sub store
 {

-       my $fh = new FileHandle;
+       my $fh = new IO::File;

        open $fh, "> $param" or confess "can't open $param $!";
        print $fh "# Geomagnetic data parameter file last mod:", scalar gmtime, "\n";
        print $fh "\$date = $date;\n";
        open $fh, "> $param" or confess "can't open $param $!";
        print $fh "# Geomagnetic data parameter file last mod:", scalar gmtime, "\n";
        print $fh "\$date = $date;\n";

diff --git a/perl/Julian.pm b/perl/Julian.pm
index c770e4a964731410c1559eff9fb0b8eb572b102f..1316fb42329202f86d240ea11315f297b8d80e1a 100644 (file)
--- a/perl/Julian.pm
+++ b/perl/Julian.pm
@@ -8,7 +8,6 @@
 
 package Julian;
 
 
 package Julian;
 

-use FileHandle;

 use DXDebug;
 use Carp;
 
 use DXDebug;
 use Carp;
 

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 8ea62b87fbda9e742fd0a481b925e753a9b2c65e..04dcb4b2241e4f9042e8fb5ffda691c0d0ded2c7 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -8,6 +8,7 @@
 
 package Prefix;
 
 
 package Prefix;
 

+use IO::File;

 use Carp;
 use DXVars;
 use DB_File;
 use Carp;
 use DXVars;
 use DB_File;


@@ -40,7 +41,7 @@ sub load
 sub store
 {
        my ($k, $l);
 sub store
 {
        my ($k, $l);

-       my $fh = new FileHandle;
+       my $fh = new IO::File;

        my $fn = "$main::data/prefix_data.pl";
   
        confess "Prefix system not started" if !$db;
        my $fn = "$main::data/prefix_data.pl";
   
        confess "Prefix system not started" if !$db;

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 2e4afe023c2c72ba6b1fa4fa85df875986213c2d..7302193a9c3bfb462bfbbc9f4ff23871dd46b2b9 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -8,7 +8,7 @@
 
 package Spot;
 
 
 package Spot;
 

-use FileHandle;
+use IO::File;

 use DXVars;
 use DXDebug;
 use DXUtil;
 use DXVars;
 use DXDebug;
 use DXUtil;

diff --git a/perl/connect.pl b/perl/connect.pl
index 590660fae70c3fb40e4fe831937257757f8134d6..fc6110a86576ef4846f4662d5c7fedcba72c3569 100755 (executable)
--- a/perl/connect.pl
+++ b/perl/connect.pl
@@ -38,7 +38,7 @@ BEGIN {
 
 use DXVars;
 use IO::Socket;
 
 use DXVars;
 use IO::Socket;

-use FileHandle;
+use IO::File;

 use Open2;
 use DXDebug;
 use POSIX qw(dup);
 use Open2;
 use DXDebug;
 use POSIX qw(dup);

diff --git a/perl/gdx.pl b/perl/gdx.pl
index 06b21e9488008e479d9f317e0e414bc01a926f45..759af1352353668cb1ab282fb8c1c183b89a246d 100755 (executable)
--- a/perl/gdx.pl
+++ b/perl/gdx.pl
@@ -3,7 +3,7 @@
 # grep for expressions in various fields of the dx file
 #
 
 # grep for expressions in various fields of the dx file
 #
 

-use FileHandle;
+use IO::File;

 use DXUtil;
 use DXDebug;
 use Spot;
 use DXUtil;
 use DXDebug;
 use Spot;