merged from lp:~donkult/apt/sid

[apt.git] / apt-pkg / versionmatch.cc

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 5c25c2f7b98cf92e1f12c53961aa51dc46110935..c40b1fdbc859b0875192ac79ca55a3d461fc6e43 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -18,6 +18,10 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <fnmatch.h>
+#include <sys/types.h>
+#include <regex.h>
+
                                                                        /*}}}*/
 
 // VersionMatch::pkgVersionMatch - Constructor                         /*{{{*/
@@ -63,8 +67,8 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
         if (isdigit(Data[0]))
            RelVerStr = Data;
         else
-           RelArchive = Data;
-        
+           RelRelease = Data;
+
         if (RelVerStr.length() > 0 && RelVerStr.end()[-1] == '*')
         {
            RelVerPrefixMatch = true;
@@ -87,19 +91,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;
@@ -110,7 +118,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;
    }   
 }
@@ -147,6 +158,8 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
       {
         if (MatchVer(Ver.VerStr(),VerStr,VerPrefixMatch) == true)
            return Ver;
+        if (ExpressionMatches(VerStr, Ver.VerStr()) == true)
+           return Ver;
         continue;
       }
       
@@ -158,6 +171,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] == '/') {
+      bool res = false;
+      size_t length = strlen(pattern);
+      if (pattern[length - 1] == '/') {
+        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               /*{{{*/
 // ---------------------------------------------------------------------
@@ -169,51 +212,64 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    {
       if (MatchAll == true)
         return true;
-      
+
 /*      cout << RelVerStr << ',' << RelOrigin << ',' << RelArchive << ',' << RelLabel << 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(RelComponent,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 (File->Site == 0)
            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 (strcmp(File.Site(),"") == 0 && File->Archive != 0 && strcmp(File.Archive(),"now") == 0) // skip the status file
            return false;
-      return (OrSite == File.Site());          /* both strings match */
+      return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
    }
-   
+
    return false;
 }
                                                                        /*}}}*/