main/enquiry.c: modify getttywidth() to check COLUMNS environment

scripts/controllib.pl: remove warnings for LOGNAME stuff

1 files changed, 0 insertions, 9 deletions

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index f7a308de7..be249b38e 100755
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -51,15 +51,6 @@ if(!defined($getlogin)) {
 }
 
 if (defined ($ENV{'LOGNAME'})) {
-    if (!defined ($getlogin)) {
-        # Hmmm, do we really need this?
-	# warn (sprintf ('no utmp entry available, using value of LOGNAME ("%s")', $ENV{'LOGNAME'})); 
-    } else {
-	if ($getlogin ne $ENV{'LOGNAME'}) { 
-	    warn (sprintf ('utmp entry ("%s") does not match value of LOGNAME ("%s"); using "%s"',
-			   $getlogin, $ENV{'LOGNAME'}, $ENV{'LOGNAME'}));
-	}
-    }
     @fowner = getpwnam ($ENV{'LOGNAME'});
     if (! @fowner) { die (sprintf ('unable to get login information for username "%s"', $ENV{'LOGNAME'})); }
 } elsif (defined ($getlogin)) {