From: Scott James Remnant Date: Mon, 8 Mar 2004 17:38:01 +0000 (+0000) Subject: Apply patch from Colin Watson to fix #139781; dselect had a X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b40f4d5c4a05ebdba306f12c9ea2a893f5b6dbf;p=dpkg Apply patch from Colin Watson to fix #139781; dselect had a hard-coded maximum window width of 179 chars for some things, when COLS is easily available. --- diff --git a/ChangeLog b/ChangeLog index 5035f1af..93e4c41b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 8 10:14:27 GMT 2004 Colin Watson + + * dselect/methlist.cc, dselect/pkgdisplay.cc: Set the total display width + to the maximum of TOTAL_LIST_WIDTH and COLS, improving display on wide + terminals. + Thu Mar 4 13:28:11 GMT 2004 Scott James Remnant * lib/tarfn.c: Copy the Name and LinkName elements and ensure they diff --git a/debian/changelog b/debian/changelog index 9a1c4ae1..ab922628 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dpkg (1.10.19) unstable; urgency=low * Distinguish unmet build dependencies from build conflicts. Closes: #217943, #235266. * Force NULL-termination of all tar file entry names. Closes: #232025. + * Allow dselect to use the full window width. Closes: #139781. -- Scott James Remnant UNRELEASED diff --git a/dselect/methlist.cc b/dselect/methlist.cc index 7761c49a..054e590d 100644 --- a/dselect/methlist.cc +++ b/dselect/methlist.cc @@ -67,6 +67,8 @@ void methodlist::setwidths() { description_column= name_column + name_width + gap_width; total_width= TOTAL_LIST_WIDTH; + if (total_width < COLS) + total_width= COLS; description_width= total_width - description_column; } diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc index 2fc17809..a1f99b69 100644 --- a/dselect/pkgdisplay.cc +++ b/dselect/pkgdisplay.cc @@ -186,6 +186,8 @@ void packagelist::setwidths() { } total_width= TOTAL_LIST_WIDTH; + if (total_width < COLS) + total_width= COLS; description_width= total_width - description_column; }