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

scripts/controllib.pl: remove warnings for LOGNAME stuff

diff --git a/ChangeLog b/ChangeLog
index ebfcc493645846d48833fbb5234de2d4bcb848ea..cff3ef5e9a76ca2532e2a8c028330118c906425e 100644 (file)
--- a/ChangeLog
+++ b/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.

diff --git a/debian/changelog b/debian/changelog
index 337bde6916db96c621a2c27a64294997bb1a5a39..ecf8d3566c14dd743f24e86bb2b97fc9745884f1 100644 (file)
--- a/debian/changelog
+++ b/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
 

diff --git a/main/enquiry.c b/main/enquiry.c
index 51b5e1ecc18b4464bc6d25c67d49139b091d242a..d8b17eed5a51675928f970e6740bee5a73986633 100644 (file)
--- a/main/enquiry.c
+++ b/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;

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index f7a308de7d835b32d30297ca2910525a94d32e88..be249b38e27503d67a5c428e7ad0c677534bed26 100755 (executable)
--- 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)) {