|
@@ -1,6 +1,6 @@
|
|
|
// -*- mode: cpp; mode: fold -*-
|
|
// -*- mode: cpp; mode: fold -*-
|
|
|
// Description /*{{{*/
|
|
// Description /*{{{*/
|
|
|
-// $Id: version.cc,v 1.7 1998/11/28 20:50:24 jgg Exp $
|
|
|
|
|
|
|
+// $Id: version.cc,v 1.8 1998/12/05 01:44:57 jgg Exp $
|
|
|
/* ######################################################################
|
|
/* ######################################################################
|
|
|
|
|
|
|
|
Version - Version string
|
|
Version - Version string
|
|
@@ -59,7 +59,6 @@ int pkgVersionCompare(string A,string B)
|
|
|
static int iVersionCompare(const char *A, const char *AEnd, const char *B,
|
|
static int iVersionCompare(const char *A, const char *AEnd, const char *B,
|
|
|
const char *BEnd)
|
|
const char *BEnd)
|
|
|
{
|
|
{
|
|
|
- // cout << string(A,AEnd) << ',' << string(B,BEnd) << endl;
|
|
|
|
|
if (A >= AEnd && B >= BEnd)
|
|
if (A >= AEnd && B >= BEnd)
|
|
|
return 0;
|
|
return 0;
|
|
|
if (A >= AEnd)
|
|
if (A >= AEnd)
|
|
@@ -182,9 +181,9 @@ int pkgVersionCompare(const char *A, const char *AEnd, const char *B,
|
|
|
for (;dlhs > lhs && *dlhs != '-'; dlhs--);
|
|
for (;dlhs > lhs && *dlhs != '-'; dlhs--);
|
|
|
for (;drhs > rhs && *drhs != '-'; drhs--);
|
|
for (;drhs > rhs && *drhs != '-'; drhs--);
|
|
|
|
|
|
|
|
- if (dlhs == A)
|
|
|
|
|
|
|
+ if (dlhs == lhs)
|
|
|
dlhs = AEnd;
|
|
dlhs = AEnd;
|
|
|
- if (drhs == B)
|
|
|
|
|
|
|
+ if (drhs == rhs)
|
|
|
drhs = BEnd;
|
|
drhs = BEnd;
|
|
|
|
|
|
|
|
// Compare the main version
|
|
// Compare the main version
|