tidied up login: changes in client.pl

diff --git a/perl/client.pl b/perl/client.pl
index db3bb80a1b720be88880cd3b5323c0d2e1e5410d..84ab5d530ee7e770636299302306469c2ad3dc18 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -369,6 +369,9 @@ if ($loginreq) {
        my $user;
        my $s;
 
+       $connsort = 'telnet' if $connsort eq 'local';
+       setmode();
+
        if (-e "$data/issue") {
                open(I, "$data/issue") or die;
                local $/ = undef;
@@ -386,14 +389,17 @@ if ($loginreq) {
                
        $stdout->print('login: ');
        $stdout->flush();
-       local $\ = $nl;
+       local $\ = $mynl;
        $s = $stdin->getline();
        chomp $s;
        $s =~ s/\s+//og;
        $s =~ s/-\d+$//o;            # no ssids!
-       cease(0) unless $s gt ' ' && iscallsign($s);
+       cease(0) unless $s && $s gt ' ';
+       unless (iscallsign($s)) {
+               $stdout->print("Sorry, $s is an invalid callsign");
+               cease(0);
+       } 
        $call = uc $s;
-       $connsort = 'telnet' if $connsort eq 'local';
        alarm(0);
 }