merged with mvo branch

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

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 194df9ebc289e9c4b4aa9e6e018de8b63875ed26..4a426809c9095bc9002137beaf75b4b3904cd89a 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: versionmatch.cc,v 1.3 2001/04/29 05:13:51 jgg Exp $
+// $Id: versionmatch.cc,v 1.9 2003/05/19 17:58:26 doogie Exp $
 /* ######################################################################
 
    Version Matching 
@@ -11,15 +11,13 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/versionmatch.h"
-#endif
 #include <apt-pkg/versionmatch.h>
 
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
+#include <ctype.h>
                                                                        /*}}}*/
 
 // VersionMatch::pkgVersionMatch - Constructor                         /*{{{*/
@@ -27,6 +25,10 @@
 /* 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 +38,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,11 +49,14 @@ 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
@@ -60,7 +65,7 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
         else
            RelArchive = Data;
         
-        if (RelVerStr.end()[-1] == '*')
+        if (RelVerStr.length() > 0 && RelVerStr.end()[-1] == '*')
         {
            RelVerPrefixMatch = true;
            RelVerStr = string(RelVerStr.begin(),RelVerStr.end()-1);
@@ -124,8 +129,7 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
       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;
@@ -163,6 +167,9 @@ 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;*/
       
@@ -198,11 +205,13 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    
    if (Type == Origin)
    {
-      if (OrSite.empty() == false)
-        if (File->Site == 0 ||
-            OrSite != File.Site())
+      if (OrSite.empty() == false) {
+        if (File->Site == 0 || OrSite != File.Site())
            return false;
-      return true;
+      } else // so we are talking about file:// or status file
+        if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file
+           return false;
+      return (OrSite == File.Site());          /* both strings match */
    }
    
    return false;