- check type in lookup_bin_checksum, make it possible to retrieve PKGID/HDRID/LEADSIG...

[platform/upstream/libsolv.git] / src / evr.c

diff --git a/src/evr.c b/src/evr.c
index 4942d40..cbb0fb0 100644 (file)
--- a/src/evr.c
+++ b/src/evr.c
@@ -18,15 +18,11 @@
 
 
 
-#if defined(DEBIAN_SEMANTICS) || defined(MULTI_SEMANTICS)
-
-#ifdef MULTI_SEMANTICS
-# define solv_vercmp solv_vercmp_deb
-#endif
+#if defined(DEBIAN) || defined(MULTI_SEMANTICS)
 
 /* debian type version compare */
 int
-solv_vercmp(const char *s1, const char *q1, const char *s2, const char *q2)
+solv_vercmp_deb(const char *s1, const char *q1, const char *s2, const char *q2)
 {
   int r, c1, c2;
   while (1)
@@ -64,19 +60,86 @@ solv_vercmp(const char *s1, const char *q1, const char *s2, const char *q2)
     }
 }
 
-#ifdef MULTI_SEMANTICS
-# undef solv_vercmp
-#endif
-
 #endif
 
-#if !defined(DEBIAN_SEMANTICS) || defined(MULTI_SEMANTICS)
+#if !defined(DEBIAN) || defined(MULTI_SEMANTICS)
 
 /* rpm type version compare */
 /* note: the code assumes that *q1 and *q2 are not alphanumeric! */
 
 int
-solv_vercmp(const char *s1, const char *q1, const char *s2, const char *q2)
+solv_vercmp_rpm(const char *s1, const char *q1, const char *s2, const char *q2)
+{
+  int r = 0;
+  const char *e1, *e2;
+
+  for (;;)
+    {
+      while (s1 < q1 && !(*s1 >= '0' && *s1 <= '9') &&
+          !(*s1 >= 'a' && *s1 <= 'z') && !(*s1 >= 'A' && *s1 <= 'Z') && *s1 != '~')
+       s1++;
+      while (s2 < q2 && !(*s2 >= '0' && *s2 <= '9') &&
+          !(*s2 >= 'a' && *s2 <= 'z') && !(*s2 >= 'A' && *s2 <= 'Z') && *s2 != '~')
+       s2++;
+      if (s1 < q1 && *s1 == '~')
+        {
+         if (s2 < q2 && *s2 == '~')
+           {
+             s1++;
+             s2++;
+             continue;
+           }
+         return -1;
+        }
+      if (s2 < q2 && *s2 == '~')
+       return 1;
+      if (s1 >= q1 || s2 >= q2)
+       break;
+      if ((*s1 >= '0' && *s1 <= '9') || (*s2 >= '0' && *s2 <= '9'))
+       {
+         while (*s1 == '0' && s1[1] >= '0' && s1[1] <= '9')
+           s1++;
+         while (*s2 == '0' && s2[1] >= '0' && s2[1] <= '9')
+           s2++;
+         for (e1 = s1; *e1 >= '0' && *e1 <= '9'; )
+           e1++;
+         for (e2 = s2; *e2 >= '0' && *e2 <= '9'; )
+           e2++;
+         r = (e1 - s1) - (e2 - s2);
+          if (!r)
+           r = strncmp(s1, s2, e1 - s1);
+          if (r)
+           return r > 0 ? 1 : -1;
+       }
+      else
+       {
+         for (e1 = s1; (*e1 >= 'a' && *e1 <= 'z') || (*e1 >= 'A' && *e1 <= 'Z'); )
+           e1++;
+         for (e2 = s2; (*e2 >= 'a' && *e2 <= 'z') || (*e2 >= 'A' && *e2 <= 'Z'); )
+           e2++;
+         r = (e1 - s1) - (e2 - s2);
+          if (r > 0)
+           {
+             r = strncmp(s1, s2, e2 - s2);
+             return r >= 0 ? 1 : -1;
+           }
+          if (r < 0)
+           {
+             r = strncmp(s1, s2, e1 - s1);
+             return r <= 0 ? -1 : 1;
+           }
+         r = strncmp(s1, s2, e1 - s1);
+         if (r)
+           return r > 0 ? 1 : -1;
+       }
+      s1 = e1;
+      s2 = e2;
+    }
+  return s1 < q1 ? 1 : s2 < q2 ? -1 : 0;
+}
+
+int
+solv_vercmp_rpm_notilde(const char *s1, const char *q1, const char *s2, const char *q2)
 {
   int r = 0;
   const char *e1, *e2;
@@ -134,8 +197,30 @@ solv_vercmp(const char *s1, const char *q1, const char *s2, const char *q2)
 
 #endif
 
+
+/* 
+ * the solv_vercmp variant your system uses.
+ */
+int
+solv_vercmp(const char *s1, const char *q1, const char *s2, const char *q2)
+{
+#if defined(DEBIAN)
+  return solv_vercmp_deb(s1, q1, s2, q2);
+#elif defined(ARCHLINUX)
+  return solv_vercmp_rpm_notilde(s1, q1, s2, q2);
+#else
+  return solv_vercmp_rpm(s1, q1, s2, q2);
+#endif
+}
+
 #if defined(MULTI_SEMANTICS)
-# define solv_vercmp (*(pool->disttype == DISTTYPE_DEB ? &solv_vercmp_deb : &solv_ver##cmp))
+# define solv_vercmp (*(pool->disttype == DISTTYPE_DEB ? &solv_vercmp_deb : &solv_ver##cmp_rpm))
+#elif defined(DEBIAN)
+# define solv_vercmp solv_vercmp_deb
+#elif defined(ARCHLINUX)
+# define solv_vercmp solv_vercmp_rpm_notilde
+#else
+# define solv_vercmp solv_vercmp_rpm
 #endif
 
 /* edition (e:v-r) compare */
@@ -166,6 +251,8 @@ pool_evrcmp_str(const Pool *pool, const char *evr1, const char *evr2, int mode)
       s1 = evr1;
       s2 = evr2;
     }
+
+  /* compare the epoch */
   if (s1 == evr1 || *s1 != ':')
     s1 = 0;
   if (s2 == evr2 || *s2 != ':')
@@ -197,6 +284,8 @@ pool_evrcmp_str(const Pool *pool, const char *evr1, const char *evr2, int mode)
        return -1;
       evr2 = s2 + 1;
     }
+
+  /* same epoch, now split into version/release */
   for (s1 = evr1, r1 = 0; *s1; s1++)
     if (*s1 == '-')
       r1 = s1;
@@ -219,10 +308,44 @@ pool_evrcmp_str(const Pool *pool, const char *evr1, const char *evr2, int mode)
     }
   if (mode == EVRCMP_COMPARE_EVONLY)
     return 0;
+  if (mode == EVRCMP_MATCH_RELEASE)
+    {
+      /* rpm treats empty releases as missing, i.e "foo = 4-" is the same as "foo = 4" */
+      if (r1 && r1 + 1 == s1)
+       r1 = 0;
+      if (r2 && r2 + 1 == s2)
+       r2 = 0;
+    }
   if (r1 && r2)
     {
-      if (s1 != ++r1 && s2 != ++r2)
-        r = solv_vercmp(r1, s1, r2, s2);
+      r1++;
+      r2++;
+      if (mode != EVRCMP_MATCH || (s1 != r1 && s2 != r2))
+       {
+         if (pool->havedistepoch)
+           {
+             const char *d1, *d2;
+             for (d1 = r1; d1 < s1; d1++)
+               if (*d1 == ':')
+                 break;
+             for (d2 = r2; d2 < s2; d2++)
+               if (*d2 == ':')
+                 break;
+             /* XXX: promote just in one direction? */
+             r = solv_vercmp(r1, d1 ? d1 : s1, r2, d2 ? d2 : s2);
+             if (r == 0 && d1 < s1 && d2 < s2)
+               r = solv_vercmp(d1 + 1, s1, d2 + 1, s2);
+           }
+         else
+            r = solv_vercmp(r1, s1, r2, s2);
+       }
+    }
+  else if (mode == EVRCMP_MATCH_RELEASE)
+    {
+      if (!r1 && r2)
+       return -2;
+      if (r1 && !r2)
+       return 2;
     }
   return r;
 }