Merge branch 'feature/abspath' into feature/apt-install-deb

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

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index e5f0fafd29ce0773922e2bfca71f65470b17bd8a..284098bdf275da546fd97bcc6ed6d86dfa667913 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -11,15 +11,26 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // 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/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 <stdio.h>
 #include <ctype.h>

+#include <fnmatch.h>
+#include <regex.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using std::string;
+

 // VersionMatch::pkgVersionMatch - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* Break up the data string according to the selected type */
 // VersionMatch::pkgVersionMatch - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* Break up the data string according to the selected type */


@@ -56,7 +67,7 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
       
       // Are we a simple specification?
       string::const_iterator I = Data.begin();
       
       // 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 (I == Data.end())
       {
         // Temporary


@@ -114,7 +125,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
    
    if (Type == Origin)
    {
    
    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;
    }   
 }
       return;
    }   
 }


@@ -145,16 +159,18 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
 pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
 {
    pkgCache::VerIterator Ver = Pkg.VersionList();
 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 (Type == Version)
       {
         if (MatchVer(Ver.VerStr(),VerStr,VerPrefixMatch) == true)
            return Ver;

+        if (ExpressionMatches(VerStr, Ver.VerStr()) == true)
+           return Ver;

         continue;
       }
       
         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;
    }
         if (FileMatch(VF.File()) == true)
            return Ver;
    }


@@ -162,6 +178,36 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
    // This will be Ended by now.
    return Ver;
 }
    // 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               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // VersionMatch::FileMatch - Match against an index file               /*{{{*/
 // ---------------------------------------------------------------------


@@ -185,37 +231,37 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
 
       if (RelVerStr.empty() == false)
         if (File->Version == 0 ||
 
       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)
            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 ||
            return false;
       if (RelArchive.empty() == false)
         if (File->Archive == 0 ||

-            stringcasecmp(RelArchive,File.Archive()) != 0)
+            !ExpressionMatches(RelArchive,File.Archive()))

             return false;
       if (RelCodename.empty() == false)
         if (File->Codename == 0 ||
             return false;
       if (RelCodename.empty() == false)
         if (File->Codename == 0 ||

-            stringcasecmp(RelCodename,File.Codename()) != 0)
+            !ExpressionMatches(RelCodename,File.Codename()))

             return false;
       if (RelRelease.empty() == false)
         if ((File->Archive == 0 ||
             return false;
       if (RelRelease.empty() == false)
         if ((File->Archive == 0 ||

-            stringcasecmp(RelRelease,File.Archive()) != 0) &&
+            !ExpressionMatches(RelRelease,File.Archive())) &&

              (File->Codename == 0 ||
              (File->Codename == 0 ||

-             stringcasecmp(RelRelease,File.Codename()) != 0))
+             !ExpressionMatches(RelRelease,File.Codename())))

               return false;
       if (RelLabel.empty() == false)
         if (File->Label == 0 ||
               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 ||
            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 ||
            return false;
       if (RelArchitecture.empty() == false)
         if (File->Architecture == 0 ||

-            stringcasecmp(RelArchitecture,File.Architecture()) != 0)
+            !ExpressionMatches(RelArchitecture,File.Architecture()))

            return false;
       return true;
    }
            return false;
       return true;
    }


@@ -223,12 +269,12 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    if (Type == Origin)
    {
       if (OrSite.empty() == false) {
    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
            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 false;

-      return (OrSite == File.Site());          /* both strings match */
+      return (ExpressionMatches(OrSite, File.Site())); /* both strings match */

    }
 
    return false;
    }
 
    return false;