##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include <apt-pkg/versionmatch.h>
+#include<config.h>
+#include <apt-pkg/versionmatch.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
#include <stdio.h>
#include <ctype.h>
#include <fnmatch.h>
-#include <sys/types.h>
#include <regex.h>
-
/*}}}*/
+using std::string;
+
// VersionMatch::pkgVersionMatch - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* Break up the data string according to the selected type */
// Are we a simple specification?
string::const_iterator I = Data.begin();
- for (; I != Data.end() && *I != '='; I++);
+ for (; I != Data.end() && *I != '='; ++I);
if (I == Data.end())
{
// Temporary
if (Type == Origin)
{
- OrSite = Data;
+ if (Data[0] == '"' && Data.length() >= 2 && Data.end()[-1] == '"')
+ OrSite = Data.substr(1, Data.length() - 2);
+ else
+ OrSite = Data;
return;
}
}
// ---------------------------------------------------------------------
/* */
bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
-{
+{
+ if (A == NULL)
+ return false;
+
const char *Ab = A;
const char *Ae = Ab + strlen(A);
pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
{
pkgCache::VerIterator Ver = Pkg.VersionList();
- for (; Ver.end() == false; Ver++)
+ for (; Ver.end() == false; ++Ver)
{
- if (Type == Version)
- {
- if (MatchVer(Ver.VerStr(),VerStr,VerPrefixMatch) == true)
- return Ver;
- continue;
- }
-
- for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
- if (FileMatch(VF.File()) == true)
- return Ver;
+ if (VersionMatches(Ver))
+ return Ver;
}
-
+
// This will be Ended by now.
return Ver;
}
+ /*}}}*/
+
+// VersionMatch::Find - Locate the best match for the select type /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgVersionMatch::VersionMatches(pkgCache::VerIterator Ver)
+{
+ if (Type == Version)
+ {
+ if (MatchVer(Ver.VerStr(),VerStr,VerPrefixMatch) == true)
+ return true;
+ if (ExpressionMatches(VerStr, Ver.VerStr()) == true)
+ return true;
+ return false;
+ }
+
+ for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF)
+ if (FileMatch(VF.File()) == true)
+ return true;
+
+ return false;
+}
+ /*}}}*/
#ifndef FNM_CASEFOLD
#define FNM_CASEFOLD 0
#endif
-bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)
+bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)/*{{{*/
{
- std::cerr << "MATCH " << pattern;
+ if (pattern == NULL || string == NULL)
+ return false;
if (pattern[0] == '/') {
- bool res = false;
size_t length = strlen(pattern);
if (pattern[length - 1] == '/') {
+ bool res = false;
regex_t preg;
char *regex = strdup(pattern + 1);
regex[length - 2] = '\0';
if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) {
- std::cerr << "E: Invalid regular expression: " << regex << "\n";
+ _error->Warning("Invalid regular expression: %s", regex);
} else if (regexec(&preg, string, 0, NULL, 0) == 0) {
res = true;
}
free(regex);
+ regfree(&preg);
return res;
}
}
return false;
if (RelVerStr.empty() == false)
- if (File->Version == 0 ||
- (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false &&
- ExpressionMatches(RelVerStr, File.Version()) == false))
+ if (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false &&
+ ExpressionMatches(RelVerStr, File.Version()) == false)
return false;
if (RelOrigin.empty() == false)
- if (File->Origin == 0 || !ExpressionMatches(RelOrigin,File.Origin()))
+ if (!ExpressionMatches(RelOrigin,File.Origin()))
return false;
if (RelArchive.empty() == false)
- if (File->Archive == 0 ||
- !ExpressionMatches(RelArchive,File.Archive()))
+ if (!ExpressionMatches(RelArchive,File.Archive()))
return false;
if (RelCodename.empty() == false)
- if (File->Codename == 0 ||
- !ExpressionMatches(RelCodename,File.Codename()))
+ if (!ExpressionMatches(RelCodename,File.Codename()))
return false;
if (RelRelease.empty() == false)
- if ((File->Archive == 0 ||
- !ExpressionMatches(RelRelease,File.Archive())) &&
- (File->Codename == 0 ||
- !ExpressionMatches(RelRelease,File.Codename())))
+ if (!ExpressionMatches(RelRelease,File.Archive()) &&
+ !ExpressionMatches(RelRelease,File.Codename()))
return false;
if (RelLabel.empty() == false)
- if (File->Label == 0 ||
- !ExpressionMatches(RelLabel,File.Label()))
+ if (!ExpressionMatches(RelLabel,File.Label()))
return false;
if (RelComponent.empty() == false)
- if (File->Component == 0 ||
- !ExpressionMatches(RelComponent,File.Component()))
+ if (!ExpressionMatches(RelComponent,File.Component()))
return false;
if (RelArchitecture.empty() == false)
- if (File->Architecture == 0 ||
- !ExpressionMatches(RelArchitecture,File.Architecture()))
+ if (!ExpressionMatches(RelArchitecture,File.Architecture()))
return false;
return true;
}
if (Type == Origin)
{
if (OrSite.empty() == false) {
- if (File->Site == 0 || !ExpressionMatches(OrSite, File.Site()))
- return false;
- } else // so we are talking about file:// or status file
- if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file
+ if (File.Site() == NULL)
return false;
+ }
+ else if (File->Release == 0)// only 'bad' files like dpkg.status file has no release file
+ return false;
return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
}
projects / apt.git / blobdiff