merge in changes from BAA

diff --git a/Changes b/Changes
index 11bea0bcb4eaea944dcd63d66fbd4bce829f9fb7..1fa3106cc05204787898c4f967d13b01811e087d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
+22May99=======================================================================
+1. added check for -1 from Date::Parse and return undef for out of range dates
+2. added show/files and type commands
 21May99=======================================================================
 1. made set/nodx work again.
-2. mode dx stuff queue nicely again.
+2. made dx stuff queue nicely again.
 18May99=======================================================================
 1. Added announce dup checking.
 2. Added system announce filtering.

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 61734e449470224b6986bf0a280f51073e069003..d5f57c03d8fff668c0e5048cdc35416f6badbe90 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -441,7 +441,8 @@ filearea 'bulletins' you want to look at file 'arld051' you would
 enter:-
    TYPE bulletins/arld051
 
-See also SHOW/FILES to see what fileareas are available and a list of content
+See also SHOW/FILES to see what fileareas are available and a 
+list of content.
 
 === 0^WX <text>^Send a weather message to local users
 === 0^WX FULL <text>^Send a weather message to all cluster users

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 97aaa35514b21060cf8fc5ac78f09a47080a7a09..a43880a2987dc729d77bac8c29e199ce9d3ca82b 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -253,7 +253,7 @@ sub process
                        $f[3] =~ s/^\///o;   # remove the leading /
                        $f[3] = lc $f[3];       # to lower case;
                        dbg('msg', "incoming file $f[3]\n");
-                       last SWITCH if $f[3] =~ /^(perl|cmd|local|src|lib|include|sys|msg|connect)/; # prevent access to executables
+                       $f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
                        
                        # create any directories
                        my @part = split /\//, $f[3];

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 7cde642c00206f806f3232e0d6f25b3a394d48b6..04d62e4b55b02c3c23820cb3761c047b44af99e1 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -737,7 +737,7 @@ sub send_dx_spot
                        }
                } elsif ($dxchan->is_user && $dxchan->{dx}) {
                        my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
-                       $buf .= "\a\a" if $dxchan->beep;
+                       $buf .= "\a\a" if $dxchan->{beep};
                        if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
                                $dxchan->send($buf) if !$hops || ($hops && $filter);
                        } else {

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 07e3f4cb3bede190e80ae629259be3b8df7da646..868110ea36d6e7de266d4c7e28a704181787b276 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -72,7 +72,8 @@ sub cltounix
        $date = "$1 $2 $3";
        return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/;
        $time = "$1:$2 +0000";
-       return str2time("$date $time");
+       my $r = str2time("$date $time");
+       return $r == -1 ? undef : $r;
 }
 
 # turn a latitude in degrees into a string