X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b2e465d6d32d2dc884f58b94acb7e35f671a87fe..fce9f472046344d15d4f4df281a003d837cf4177:/apt-pkg/versionmatch.cc?ds=sidebyside
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 45cdb117e..26262a010 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: versionmatch.cc,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: versionmatch.cc,v 1.9 2003/05/19 17:58:26 doogie Exp $
/* ######################################################################
Version Matching
@@ -11,22 +11,30 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/versionmatch.h"
-#endif
-#include <apt-pkg/versionmatch.h>
+#include<config.h>
+#include <apt-pkg/versionmatch.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#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 */
pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
{
+ MatchAll = false;
+ VerPrefixMatch = false;
+ RelVerPrefixMatch = false;
+
if (Type == None || Data.length() < 1)
return;
@@ -36,7 +44,7 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
if (Data.end()[-1] == '*')
{
VerPrefixMatch = true;
- VerStr = string(Data.begin(),Data.end()-1);
+ VerStr = string(Data,0,Data.length()-1);
}
else
VerStr = Data;
@@ -47,20 +55,23 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
{
// All empty = match all
if (Data == "*")
+ {
+ MatchAll = true;
return;
+ }
// Are we a simple specification?
- const char *I = Data.begin();
- for (; I < Data.end() && *I != '='; I++);
+ string::const_iterator I = Data.begin();
+ for (; I != Data.end() && *I != '='; ++I);
if (I == Data.end())
{
// Temporary
if (isdigit(Data[0]))
RelVerStr = Data;
else
- RelArchive = Data;
-
- if (RelVerStr.end()[-1] == '*')
+ RelRelease = Data;
+
+ if (RelVerStr.length() > 0 && RelVerStr.end()[-1] == '*')
{
RelVerPrefixMatch = true;
RelVerStr = string(RelVerStr.begin(),RelVerStr.end()-1);
@@ -82,19 +93,23 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
{
if (strlen(Fragments[J]) < 3)
continue;
-
+
if (stringcasecmp(Fragments[J],Fragments[J]+2,"v=") == 0)
RelVerStr = Fragments[J]+2;
else if (stringcasecmp(Fragments[J],Fragments[J]+2,"o=") == 0)
RelOrigin = Fragments[J]+2;
else if (stringcasecmp(Fragments[J],Fragments[J]+2,"a=") == 0)
RelArchive = Fragments[J]+2;
+ else if (stringcasecmp(Fragments[J],Fragments[J]+2,"n=") == 0)
+ RelCodename = Fragments[J]+2;
else if (stringcasecmp(Fragments[J],Fragments[J]+2,"l=") == 0)
RelLabel = Fragments[J]+2;
else if (stringcasecmp(Fragments[J],Fragments[J]+2,"c=") == 0)
RelComponent = Fragments[J]+2;
+ else if (stringcasecmp(Fragments[J],Fragments[J]+2,"b=") == 0)
+ RelArchitecture = Fragments[J]+2;
}
-
+
if (RelVerStr.end()[-1] == '*')
{
RelVerPrefixMatch = true;
@@ -105,7 +120,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
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;
}
}
@@ -119,13 +137,12 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
const char *Ae = Ab + strlen(A);
// Strings are not a compatible size.
- if ((unsigned)(Ae - Ab) != B.length() && Prefix == false ||
+ if (((unsigned)(Ae - Ab) != B.length() && Prefix == false) ||
(unsigned)(Ae - Ab) < B.length())
return false;
// Match (leading?)
- if (stringcasecmp(B.begin(),B.end(),
- Ab,Ab + B.length()) == 0)
+ if (stringcasecmp(B,Ab,Ab + B.length()) == 0)
return true;
return false;
@@ -137,16 +154,18 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
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;
+ if (ExpressionMatches(VerStr, Ver.VerStr()) == true)
+ return Ver;
continue;
}
- for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
+ for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF)
if (FileMatch(VF.File()) == true)
return Ver;
}
@@ -154,6 +173,36 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
// This will be Ended by now.
return Ver;
}
+
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD 0
+#endif
+
+bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)
+{
+ if (pattern[0] == '/') {
+ 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) {
+ _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 fnmatch(pattern, string, FNM_CASEFOLD) == 0;
+}
+bool pkgVersionMatch::ExpressionMatches(const std::string& pattern, const char *string)
+{
+ return ExpressionMatches(pattern.c_str(), string);
+}
/*}}}*/
// VersionMatch::FileMatch - Match against an index file /*{{{*/
// ---------------------------------------------------------------------
@@ -163,48 +212,66 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
{
if (Type == Release)
{
+ if (MatchAll == true)
+ return true;
+
/* cout << RelVerStr << ',' << RelOrigin << ',' << RelArchive << ',' << RelLabel << endl;
- cout << File.Version() << ',' << File.Origin() << ',' << File.Archive() << ',' << File.Label() << endl;
-*/
+ cout << File.Version() << ',' << File.Origin() << ',' << File.Archive() << ',' << File.Label() << endl;*/
+
if (RelVerStr.empty() == true && RelOrigin.empty() == true &&
RelArchive.empty() == true && RelLabel.empty() == true &&
- RelComponent.empty() == true)
+ RelRelease.empty() == true && RelCodename.empty() == true &&
+ RelComponent.empty() == true && RelArchitecture.empty() == true)
return false;
-
+
if (RelVerStr.empty() == false)
if (File->Version == 0 ||
- MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false)
+ (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false &&
+ ExpressionMatches(RelVerStr, File.Version()) == false))
return false;
if (RelOrigin.empty() == false)
- if (File->Origin == 0 ||
- stringcasecmp(RelOrigin,File.Origin()) != 0)
+ if (File->Origin == 0 || !ExpressionMatches(RelOrigin,File.Origin()))
return false;
if (RelArchive.empty() == false)
- {
- if (File->Archive == 0 ||
- stringcasecmp(RelArchive,File.Archive()) != 0)
- return false;
- }
+ if (File->Archive == 0 ||
+ !ExpressionMatches(RelArchive,File.Archive()))
+ return false;
+ if (RelCodename.empty() == false)
+ if (File->Codename == 0 ||
+ !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())))
+ return false;
if (RelLabel.empty() == false)
if (File->Label == 0 ||
- stringcasecmp(RelLabel,File.Label()) != 0)
+ !ExpressionMatches(RelLabel,File.Label()))
return false;
if (RelComponent.empty() == false)
if (File->Component == 0 ||
- stringcasecmp(RelLabel,File.Component()) != 0)
+ !ExpressionMatches(RelComponent,File.Component()))
+ return false;
+ if (RelArchitecture.empty() == false)
+ if (File->Architecture == 0 ||
+ !ExpressionMatches(RelArchitecture,File.Architecture()))
return false;
return true;
}
-
+
if (Type == Origin)
{
- if (OrSite.empty() == false)
- if (File->Site == 0 ||
- OrSite != File.Site())
+ if (OrSite.empty() == false) {
+ if (File->Site == 0)
return false;
- return true;
+ } else // so we are talking about file:// or status file
+ if (strcmp(File.Site(),"") == 0 && File->Archive != 0 && strcmp(File.Archive(),"now") == 0) // skip the status file
+ return false;
+ return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
}
-
+
return false;
}
/*}}}*/