report warnings&errors consistently in edit-sources

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

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index b4d1d4696ed58b983256efff47f910c2d20b70d1..2376ca8fd80de21596b866fd42b5626da1447102 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


@@ -100,6 +111,8 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
            RelLabel = Fragments[J]+2;
         else if (stringcasecmp(Fragments[J],Fragments[J]+2,"c=") == 0)
            RelComponent = Fragments[J]+2;
            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] == '*')
       }
 
       if (RelVerStr.end()[-1] == '*')


@@ -112,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;
    }   
 }


@@ -121,7 +137,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
 // ---------------------------------------------------------------------
 /* */
 bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
 // ---------------------------------------------------------------------
 /* */
 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);
    
    const char *Ab = A;
    const char *Ae = Ab + strlen(A);
    


@@ -143,24 +162,71 @@ 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;
-        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;
 }
                                                                        /*}}}*/
    // 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)/*{{{*/
+{
+   if (pattern == NULL || string == NULL)
+      return false;
+   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               /*{{{*/
 // ---------------------------------------------------------------------
 /* This matcher checks against the release file and the origin location 
 // VersionMatch::FileMatch - Match against an index file               /*{{{*/
 // ---------------------------------------------------------------------
 /* This matcher checks against the release file and the origin location 


@@ -178,38 +244,34 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
       if (RelVerStr.empty() == true && RelOrigin.empty() == true &&
          RelArchive.empty() == true && RelLabel.empty() == true &&
          RelRelease.empty() == true && RelCodename.empty() == true &&
       if (RelVerStr.empty() == true && RelOrigin.empty() == true &&
          RelArchive.empty() == true && RelLabel.empty() == true &&
          RelRelease.empty() == true && RelCodename.empty() == true &&

-         RelComponent.empty() == true)
+         RelComponent.empty() == true && RelArchitecture.empty() == true)

         return false;
 
       if (RelVerStr.empty() == false)
         return false;
 
       if (RelVerStr.empty() == false)

-        if (File->Version == 0 ||
-            MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false)
+        if (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 (!ExpressionMatches(RelOrigin,File.Origin()))

            return false;
       if (RelArchive.empty() == false)
            return false;
       if (RelArchive.empty() == false)

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

             return false;
       if (RelCodename.empty() == false)
             return false;
       if (RelCodename.empty() == false)

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

             return false;
       if (RelRelease.empty() == false)
             return false;
       if (RelRelease.empty() == false)

-        if ((File->Archive == 0 ||
-            stringcasecmp(RelRelease,File.Archive()) != 0) &&
-             (File->Codename == 0 ||
-             stringcasecmp(RelRelease,File.Codename()) != 0))
+        if (!ExpressionMatches(RelRelease,File.Archive()) &&
+             !ExpressionMatches(RelRelease,File.Codename()))

               return false;
       if (RelLabel.empty() == false)
               return false;
       if (RelLabel.empty() == false)

-        if (File->Label == 0 ||
-            stringcasecmp(RelLabel,File.Label()) != 0)
+        if (!ExpressionMatches(RelLabel,File.Label()))

            return false;
       if (RelComponent.empty() == false)
            return false;
       if (RelComponent.empty() == false)

-        if (File->Component == 0 ||
-            stringcasecmp(RelComponent,File.Component()) != 0)
+        if (!ExpressionMatches(RelComponent,File.Component()))
+           return false;
+      if (RelArchitecture.empty() == false)
+        if (!ExpressionMatches(RelArchitecture,File.Architecture()))

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


@@ -217,12 +279,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())
-           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;
            return false;

-      return (OrSite == File.Site());          /* both strings match */
+      }
+      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 */

    }
 
    return false;
    }
 
    return false;