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

[Daniel Burrows]

Author: dburrows
Date: Sat Jun 25 21:18:02 2005
New Revision: 3437

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
Log:
Transcode the format string used to display search results.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jun 25 21:18:02 2005
@@ -1,5 +1,10 @@
 2005-06-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_search.cc:
+
+	  Transcode the format string specified by the user for displaying
+	  search results.
+
 	* src/vscreen/fragment.cc:
 
 	  Rewrite the clipbox for wide characters.

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	Sat Jun 25 21:18:02 2005
@@ -16,6 +16,7 @@
 #include <generic/matchers.h>
 
 #include <vscreen/config/column_definition.h>
+#include <vscreen/transcode.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
@@ -61,7 +62,16 @@
       screen_width=tmp;
     }
 
-  column_definition_list *columns=parse_columns(display_format,
+  std::wstring wdisplay_format;
+
+  if(!transcode(display_format.c_str(), wdisplay_format))
+    {
+      _error->DumpErrors();
+      fprintf(stderr, _("iconv of %s failed.\n"), display_format.c_str());
+      return -1;
+    }
+
+  column_definition_list *columns=parse_columns(wdisplay_format,
 						pkg_item::pkg_columnizer::parse_column_type,
 						pkg_item::pkg_columnizer::defaults);