* some WS fixes

[apt.git] / apt-pkg / deb / debversion.cc

diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index e7c42fd1151a915fafb8a4f3c33508e5e77bf7dc..aeee619296d19ee0df96eae0fd6b2b8d448ff077 100644 (file)
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debversion.cc,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: debversion.cc,v 1.8 2003/09/10 23:39:49 mdz Exp $

 /* ######################################################################
 
    Debian Version - Versioning system for Debian
 /* ######################################################################
 
    Debian Version - Versioning system for Debian


@@ -19,6 +19,7 @@
 #include <apt-pkg/pkgcache.h>
 
 #include <stdlib.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <stdlib.h>

+#include <ctype.h>

                                                                        /*}}}*/
 
 debVersioningSystem debVS;
                                                                        /*}}}*/
 
 debVersioningSystem debVS;


@@ -31,35 +32,34 @@ debVersioningSystem::debVersioningSystem()
    Label = "Standard .deb";
 }
                                                                        /*}}}*/
    Label = "Standard .deb";
 }
                                                                        /*}}}*/

-// StrToLong - Convert the string between two iterators to a long      /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static unsigned long StrToLong(const char *begin,const char *end)
-{
-   char S[40];
-   char *I = S;
-   for (; begin != end && I < S + 40;)
-      *I++ = *begin++;
-   *I = 0;
-   return strtoul(S,0,10);
-}
-                                                                       /*}}}*/
+

 // debVS::CmpFragment - Compare versions                               /*{{{*/
 // ---------------------------------------------------------------------
 // debVS::CmpFragment - Compare versions                               /*{{{*/
 // ---------------------------------------------------------------------

-/* This compares a fragment of the version. Dpkg has a really short 
-   version of this, but it is uh.. interesting to grok. */
-int debVersioningSystem::CmpFragment(const char *A,const char *AEnd, 
+/* This compares a fragment of the version. This is a slightly adapted 
+   version of what dpkg uses. */
+#define order(x) ((x) == '~' ? -1    \
+               : isdigit((x)) ? 0   \
+               : !(x) ? 0           \
+               : isalpha((x)) ? (x) \
+               : (x) + 256)
+int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,

                                     const char *B,const char *BEnd)
 {
    if (A >= AEnd && B >= BEnd)
       return 0;
    if (A >= AEnd)
                                     const char *B,const char *BEnd)
 {
    if (A >= AEnd && B >= BEnd)
       return 0;
    if (A >= AEnd)

+   {
+      if (*B == '~') return 1;

       return -1;
       return -1;

+   }

    if (B >= BEnd)
    if (B >= BEnd)

+   {
+      if (*A == '~') return -1;

       return 1;
       return 1;

-   
+   }
+

    /* Iterate over the whole string
    /* Iterate over the whole string

-      What this does is to spilt the whole string into groups of 
+      What this does is to spilt the whole string into groups of

       numeric and non numeric portions. For instance:
          a67bhgs89
       Has 4 portions 'a', '67', 'bhgs', '89'. A more normal:
       numeric and non numeric portions. For instance:
          a67bhgs89
       Has 4 portions 'a', '67', 'bhgs', '89'. A more normal:


@@ -69,58 +69,36 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
    const char *rhs = B;
    while (lhs != AEnd && rhs != BEnd)
    {
    const char *rhs = B;
    while (lhs != AEnd && rhs != BEnd)
    {

-      // Starting points
-      const char *Slhs = lhs;
-      const char *Srhs = rhs;
-      
-      // Compute ending points were we have passed over the portion
-      bool Digit = (isdigit(*lhs) > 0?true:false);
-      for (;lhs != AEnd && (isdigit(*lhs) > 0?true:false) == Digit; lhs++);
-      for (;rhs != BEnd && (isdigit(*rhs) > 0?true:false) == Digit; rhs++);
-      
-      if (Digit == true)
+      int first_diff = 0;
+
+      while (lhs != AEnd && rhs != BEnd &&
+            (!isdigit(*lhs) || !isdigit(*rhs)))

       {
       {

-        // If the lhs has a digit and the rhs does not then <
-        if (rhs - Srhs == 0)
-           return -1;
-        
-        // Generate integers from the strings.
-        unsigned long Ilhs = StrToLong(Slhs,lhs);
-        unsigned long Irhs = StrToLong(Srhs,rhs);
-        if (Ilhs != Irhs)
-        {
-           if (Ilhs > Irhs)
-              return 1;
-           return -1;
-        }
+        int vc = order(*lhs);
+        int rc = order(*rhs);
+        if (vc != rc)
+           return vc - rc;
+        lhs++; rhs++;

       }
       }

-      else
-      {
-        // They are equal length so do a straight text compare
-        for (;Slhs != lhs && Srhs != rhs; Slhs++, Srhs++)
-        {
-           if (*Slhs != *Srhs)
-           {
-              /* We need to compare non alpha chars as higher than alpha
-                 chars (a < !) */
-              int lc = *Slhs;
-              int rc = *Srhs;
-              if (isalpha(lc) == 0) lc += 256;
-              if (isalpha(rc) == 0) rc += 256;
-              if (lc > rc)
-                 return 1;
-              return -1;
-           }
-        }

 
 

-        // If the lhs is shorter than the right it is 'less'
-        if (lhs - Slhs < rhs - Srhs)
-           return -1;
+      while (*lhs == '0')
+        lhs++;
+      while (*rhs == '0')
+        rhs++;
+      while (isdigit(*lhs) && isdigit(*rhs))
+      {
+        if (!first_diff)
+           first_diff = *lhs - *rhs;
+        lhs++;
+        rhs++;
+      }

 
 

-        // If the lhs is longer than the right it is 'more'
-        if (lhs - Slhs > rhs - Srhs)
-           return 1;            
-      }      
+      if (isdigit(*lhs))
+        return 1;
+      if (isdigit(*rhs))
+        return -1;
+      if (first_diff)
+        return first_diff;

    }
 
    // The strings must be equal
    }
 
    // The strings must be equal


@@ -129,12 +107,18 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
 
    // lhs is shorter
    if (lhs == AEnd)
 
    // lhs is shorter
    if (lhs == AEnd)

+   {
+      if (*rhs == '~') return 1;

       return -1;
       return -1;

+   }

 
    // rhs is shorter
    if (rhs == BEnd)
 
    // rhs is shorter
    if (rhs == BEnd)

+   {
+      if (*lhs == '~') return -1;

       return 1;
       return 1;

-       
+   }
+

    // Shouldnt happen
    return 1;
 }
    // Shouldnt happen
    return 1;
 }