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

scripts/controllib.pl: remove warnings for LOGNAME stuff

ChangeLog

@@ -1,3 +1,8 @@
+Tue Jul  4 17:29:06 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/enquiry.c: modify getttywidth() to check COLUMNS environment
+  * scripts/controllib.pl: remove warnings for LOGNAME stuff
+
 Wed Jun 28 19:50:00 CEST 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po: Updated Swedish translation from comments received.

debian/changelog

@@ -13,6 +13,7 @@ dpkg (1.7.0) unstable; urgency=low
   * dpkg-deb: reorder files when building a package
   * dpkg-statoverride: new tool to override ownership and modes for files
   * Modify dpkg and dselect to allow versioned provides
+  * Check COLUMNS environment for dpkg -l output. Closes: Bug#65536
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

main/enquiry.c

@@ -64,7 +64,10 @@ static int getttywidth() {
   int fd;
   int res;
   struct winsize ws;
+  char *columns;
 
+  if ((columns=getenv("COLUMNS")) && ((res=atoi(columns))>0))
+    return res;
   if ((fd=open("/dev/tty",O_RDONLY))!=-1) {
     if (ioctl(fd, TIOCGWINSZ, &ws)==-1)
       ws.ws_col=80;

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)) {