X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=b10149ec6bcbd9bcf75b27e8839898878c21dd41;hb=1935ba236a7ef4999bceb00b6faf28038f3b052e;hp=ce3c2d1f285202291e3fd8667fadcff62817b05f;hpb=2ca690592ea14e2ecd6783feed99ed7a8195162c;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index ce3c2d1f..b10149ec 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -155,6 +155,10 @@ sub start $self->{registered} = 1; } + # establish slug queue, if required + $self->{sluggedpc11s} = []; + $self->{isslugged} = $DXProt::pc92_slug_changes + $main::systime if $DXProt::pc92_slug_changes; + # send the relevant MOTD $self->send_motd; @@ -996,10 +1000,12 @@ sub format_dx_spot my $t = ztime($_[2]); my $loc = ''; - my $clth = 30; + my $clth = 31 + $self->{width} - 80; # allow comment to grow according the screen width # --$clth if $self->{consort} eq 'local'; my $comment = substr (($_[3] || ''), 0, $clth); + $comment =~ s/\t/ /g; + $comment .= ' ' x ($clth - (length($comment))); if ($self->{user}->wantgrid) { @@ -1339,7 +1345,12 @@ sub spawn_cmd $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args; dbg($s); } - eval { @out = $cmdref->(@$args); }; + eval { + ++$self->{_in_sub_process}; + dbg "\$self->{_in_sub_process} = $self->{_in_sub_process}"; + @out = $cmdref->(@$args); + --$self->{_in_sub_process} if $self->{_in_sub_process} > 0; + }; if ($@) { DXDebug::dbgprintring(25); push @out, DXDebug::shortmess($@);