X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/60cb4b09173ef64528dfbe92f016240c6fec3605..304731b8f23e03d15d1c2d6f66e1bf5f26ac0ca2:/apt-pkg/cachefilter.cc

diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc
index 35f95fe22..57b9af159 100644
--- a/apt-pkg/cachefilter.cc
+++ b/apt-pkg/cachefilter.cc
@@ -55,6 +55,17 @@ PackageNameMatchesRegEx::~PackageNameMatchesRegEx() {			/*{{{*/
 }
 									/*}}}*/
 
+// Fnmatch support					/*{{{*/
+//----------------------------------------------------------------------
+bool PackageNameMatchesFnmatch::operator() (pkgCache::PkgIterator const &Pkg) {/*{{{*/
+   return fnmatch(Pattern.c_str(), Pkg.Name(), FNM_CASEFOLD) == 0;
+}
+									/*}}}*/
+bool PackageNameMatchesFnmatch::operator() (pkgCache::GrpIterator const &Grp) {/*{{{*/
+   return fnmatch(Pattern.c_str(), Grp.Name(), FNM_CASEFOLD) == 0;
+}
+									/*}}}*/
+
 // CompleteArch to <kernel>-<cpu> tuple					/*{{{*/
 //----------------------------------------------------------------------
 /* The complete architecture, consisting of <kernel>-<cpu>. */
@@ -66,19 +77,12 @@ static std::string CompleteArch(std::string const &arch) {
 		complete = complete.substr(1, complete.size()-2);
 		return complete;
 	}
-	else if (arch == "armel")		return "linux-arm";
-	else if (arch == "armhf")		return "linux-arm";
-	else if (arch == "lpia")		return "linux-i386";
-	else if (arch == "powerpcspe")		return "linux-powerpc";
-	else if (arch == "uclibc-linux-armel")	return "linux-arm";
-	else if (arch == "uclinux-armel")	return "uclinux-arm";
 	else if (arch == "any")			return "*-*";
 	else					return "linux-" + arch;
 }
 									/*}}}*/
 PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern) :/*{{{*/
-					literal(pattern), isPattern(isPattern), d(NULL) {
-	complete = CompleteArch(pattern);
+					literal(pattern), complete(CompleteArch(pattern)), isPattern(isPattern), d(NULL) {
 }
 									/*}}}*/
 bool PackageArchitectureMatchesSpecification::operator() (char const * const &arch) {/*{{{*/