From: minima <minima>
Date: Wed, 23 Mar 2005 10:06:32 +0000 (+0000)
Subject: fix ?
X-Git-Tag: 1.54~207
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=de74820014fc2c49c789ebcbe683bccf23adbfe7

fix ?
fix sh/c/n
fix sh/connect
---

diff --git a/Changes b/Changes
index 4db464bc..fbd32439 100644
--- 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 26b64f03..462fcc53 100644
--- 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 98211ddf..025c20ea 100644
--- 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 6b62f58a..9dd2b33c 100644
--- 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);