[Aptitude-svn-commit] r3618 - in branches/aptitude-0.3/aptitude: . src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Tue Jul  5 15:08:50 2005
New Revision: 3618

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
Log:
Fix a minor race condition involving resizing the terminal that could have
resulted in -w being ignored.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jul  5 15:08:50 2005
@@ -2,6 +2,12 @@
 
 	* src/cmdline/cmdline_search.cc:
 
+	  Fix a minor race condition that could have resulted in "search"
+	  not obeying the -w (width) option if the terminal was resized
+	  during a search.
+
+	* src/cmdline/cmdline_search.cc:
+
 	  Fix "search" output.
 
 2005-07-05 Rubén Porras <nahoo@inicia>

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc	Tue Jul  5 15:08:50 2005
@@ -41,6 +41,8 @@
 int cmdline_search(int argc, char *argv[], const char *status_fname,
 		   string display_format, string width, std::string sort)
 {
+  int real_width=-1;
+
   pkg_item::pkg_columnizer::setup_columns();
 
   pkg_sortpolicy *s=parse_sortpolicy(sort);
@@ -59,7 +61,7 @@
     {
       unsigned long tmp=screen_width;
       StrToNum(width.c_str(), tmp, width.size());
-      screen_width=tmp;
+      real_width=tmp;
     }
 
   std::wstring wdisplay_format;
@@ -139,7 +141,7 @@
 	   pkg_item::pkg_columnizer(*i,
 				    i->VersionList(),
 				    *columns,
-				    0).layout_columns(screen_width).c_str());
+				    0).layout_columns(real_width==-1?screen_width:real_width).c_str());
 
   delete columns;