fix ?

fix sh/c/n
fix sh/connect

diff --git a/Changes b/Changes
index 4db464bc473752c487ffc37a95f67f007ed061a7..fbd324398e73ccf66e81c097d56ae528e47bb291 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,8 @@
 22Mar05=======================================================================
+1. Fix ? so it works again.
+2. Fix Aliases for sh/c so they are correct
+3. Fix sh/connect for AGW ports and other niffnaffs.
+22Mar05=======================================================================
 1. fixed sh/c/node sh/c/a and sh/newc/n.
 21Mar05=======================================================================
 1. log AGW port on connection

diff --git a/cmd/Aliases b/cmd/Aliases
index 26b64f03b70b3ce04ded2bce210308e1782b1802..462fcc53245a8805654f7c2b6679ea5126e4b55c 100644 (file)
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -115,8 +115,8 @@ package CmdAlias;
        '^set$', 'apropos set', 'apropos',
          '^sho?w?/u$', 'show/user', 'show/user',
          '^sho?w?/bu', 'show/files bulletins', 'show/files',
-         '^sho?w?/c?o?n?f\w*/a', 'show/configuration all', 'show/configuration',
-         '^sho?w?/c?o?n?f\w*/n', 'show/configuration nodes', 'show/configuration',
+         '^sho?w?/co?n?\w*/a', 'show/configuration all', 'show/configuration',
+         '^sho?w?/co?n?\w*/n', 'show/configuration nodes', 'show/configuration',
          '^sho?w?/c$', 'show/configuration', 'show/configuration',
          '^sho?w?/com', 'dbavail', 'dbavail',
          '^sho?w?/dxcc', 'show/dx dxcc', 'show/dx',
@@ -132,7 +132,7 @@ package CmdAlias;
          '^sho?w?/myd?x?/(\d+)', 'show/dx filter $1', 'show/mydx',
          '^sho?w?/myd?x?/d(\d+)', 'show/dx filter from $1', 'show/mydx',
          '^sho?w?/myd?x?', 'show/dx filter', 'show/mydx',
-         '^sho?w?/newco?n?f?\w*/n', 'show/newconfiguration node', 'show/newconfiguration',
+         '^sho?w?/newco?n?\w*/n', 'show/newconfiguration node', 'show/newconfiguration',
          '^sho?w?/sta?$', 'show/station', 'show/station',
          '^sho?w?/tnc', 'who', 'who',
       '^sho?w?/up', 'show/cluster', 'show/cluster',

diff --git a/cmd/show/connect.pl b/cmd/show/connect.pl
index 98211ddfd31b3dc9d6560fb8d0fa1d8119d703f1..025c20ea9a29f37c3bdf72a7d6436b059a532e65 100644 (file)
--- a/cmd/show/connect.pl
+++ b/cmd/show/connect.pl
@@ -18,11 +18,13 @@ foreach my $call (sort keys %Msg::conns) {
        my $c = $call;
        my $addr;
        
-       if ($c =~ /^Server\s+(\S+)$/) {
+       if ($c =~ /^Server\s+(\S+)/) {
                $addr = $1;
                $c = "Server";
        } else {
-               $addr = "$r->{peerhost}/$r->{peerport}";
+               $addr = "AGW Port ($r->{agwport})" if exists $r->{agwport};
+               $addr ||= "$r->{peerhost}/$r->{peerport}";
+               $addr ||= "Unknown";
        }
        my $csort = $r->{csort} || '';
        my $sort = $r->{sort} || '';

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 6b62f58a820f02d1215f7b7decd1054300ad0ec0..9dd2b33c146fb6b22df90cfbfc31a54d8e159b2e 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -436,7 +436,7 @@ sub run_cmd
                # strip out // on command only
                $cmd =~ s|//|/|g;
                $cmd =~ s|^/||g;                # no leading / either
-               $cmd =~ s|[^-\w/]||g;           # and no funny characters either
+               $cmd =~ s|[^-?\w/]||g;          # and no funny characters either
                                        
                my ($path, $fcmd);