X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=5fd965ee8f1da9f0d3a950daed7036531d214495;hb=0bd9d2811cc42417676a1b11b121681c2377d70a;hp=1b390bdc7ca0b92ee52ff2d109bad7730d9f00d4;hpb=e6a53556f10b5d2f831dcd7b83655430c9b1a137;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index 1b390bdc..5fd965ee 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -32,8 +32,6 @@ use DXUtil; use IO::File; use Curses; -use Carp qw{cluck}; - use Console; # @@ -104,7 +102,7 @@ sub cease { my $sendz = shift; if ($conn && $sendz) { - $conn->send_now("Z$call|bye...\n"); + $conn->send_now("Z$call|bye..."); } endwin(); dbgclose(); @@ -402,6 +400,12 @@ sub rec_stdin $call = uc shift @ARGV if @ARGV; $call = uc $myalias if !$call; +my ($scall, $ssid) = split /-/, $call; +$ssid = undef unless $ssid && $ssid =~ /^\d+$/; +if ($ssid) { + $ssid = 15 if $ssid > 15; + $call = "$scall-$ssid"; +} if ($call eq $mycall) { print "You cannot connect as your cluster callsign ($mycall)\n"; @@ -426,15 +430,15 @@ if (! $conn) { $SIG{'INT'} = \&sig_term; $SIG{'TERM'} = \&sig_term; #$SIG{'WINCH'} = \&do_resize; -$SIG{'HUP'} = 'IGNORE'; +$SIG{'HUP'} = \&sig_term; do_initscr(); $SIG{__DIE__} = \&sig_term; -$conn->send_now("A$call|$connsort"); -$conn->send_now("I$call|set/page $maxshist"); -$conn->send_now("I$call|set/nobeep"); +$conn->send_later("A$call|$connsort"); +$conn->send_later("I$call|set/page $maxshist"); +$conn->send_later("I$call|set/nobeep"); Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);