From 0e1727bfb23ddea7bc272776b5b5c4f9c432e65f Mon Sep 17 00:00:00 2001 From: minima Date: Fri, 30 Jul 2004 16:55:51 +0000 Subject: [PATCH] fix // in talk s/bestdxchan/dxchan/ in rspfcheck --- Changes | 2 ++ perl/DXChannel.pm | 4 ++-- perl/DXCommandmode.pm | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Changes b/Changes index 6dafb764..02e85d5a 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +30Jul04======================================================================= +1. make sure that // is not converted to / in command lines. 28Jul04======================================================================= 1. backported 'Investigate' from NP branch so that only pingable nodes are 'believed'. diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 829c6b55..d0c995d9 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -524,7 +524,7 @@ sub rspfcheck { my ($self, $flag, $node, $user) = @_; my $nref = Route::Node::get($node); - my $dxchan = $nref->bestdxchan if $nref; + my $dxchan = $nref->dxchan if $nref; if ($nref && $dxchan) { if ($dxchan == $self) { return 1 unless $user; @@ -533,7 +533,7 @@ sub rspfcheck return 1 if @users == 0 || grep $user eq $_, @users; dbg("RSPF: $user not on $node") if isdbg('chanerr'); } else { - dbg("RSPF: Shortest path for $node is " . $nref->bestdxchan->{call}) if isdbg('chanerr'); + dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr'); } } else { return 1 if $flag; diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index aa6f743d..ac141b36 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -418,15 +418,14 @@ sub run_cmd return () if length $cmdline == 0; - # strip out // - $cmdline =~ s|//|/|og; - # split the command line up into parts, the first part is the command my ($cmd, $args) = split /\s+/, $cmdline, 2; $args = "" unless defined $args; if ($cmd) { - + # strip out // on command only + $cmd =~ s|//|/|g; + my ($path, $fcmd); dbg("cmd: $cmd") if isdbg('command'); -- 2.43.0