make apt search case-insensitive by default

diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index 8106333b644a23275dcbea222192846935b84df0..ecd5d7fadd9492ed11fa91091fbb9b614549d240 100644 (file)
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -68,8 +68,12 @@ bool FullTextSearch(CommandLine &CmdL)                                       /*{{{*/
          const char *pattern = patterns[i];
          all_found &=  (
             strstr(V.ParentPkg().Name(), pattern) != NULL ||
          const char *pattern = patterns[i];
          all_found &=  (
             strstr(V.ParentPkg().Name(), pattern) != NULL ||

-            parser.ShortDesc().find(pattern) != std::string::npos ||
-            parser.LongDesc().find(pattern) != std::string::npos);
+            strcasestr(parser.ShortDesc().c_str(), pattern) != NULL ||
+            strcasestr(parser.LongDesc().c_str(), pattern) != NULL);
+         // search patterns are AND by default so we can skip looking further
+         // on the first mismatch
+         if(all_found == false)
+            break;

       }
       if (all_found)
       {
       }
       if (all_found)
       {

diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search
index 84650b366ea0ba9423b3aea11c65d53fc6b6d608..58613717b1677b5a91c0e8c9760aea7f75b2ee33 100755 (executable)
--- a/test/integration/test-apt-cli-search
+++ b/test/integration/test-apt-cli-search
@@ -13,7 +13,7 @@ if [ ! -x ${BUILDDIRECTORY}/apt ]; then
     exit 0
 fi
 
     exit 0
 fi
 

-DESCR='Some description that has a unusual word xxyyzz and aabbcc'
+DESCR='Some description that has a unusual word xxyyzz and aabbcc and a UPPERCASE'

 DESCR2='Some other description with the unusual aabbcc only'
 insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
 insertpackage 'testing' 'bar' 'i386' '2.0' '' '' "$DESCR2"
 DESCR2='Some other description with the unusual aabbcc only'
 insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
 insertpackage 'testing' 'bar' 'i386' '2.0' '' '' "$DESCR2"


@@ -39,6 +39,11 @@ testequal "foo/unstable 1.0 all
   $DESCR
 " apt search -qq aabbcc xxyyzz
 
   $DESCR
 " apt search -qq aabbcc xxyyzz
 

+# search is not case-sensitive by default
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq uppercase
+

 # output is sorted and search word finds both package
 testequal "bar/testing 2.0 i386
   $DESCR2
 # output is sorted and search word finds both package
 testequal "bar/testing 2.0 i386
   $DESCR2