From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 19 14:53:21 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CA2C106564A;
	Wed, 19 Nov 2008 14:53:21 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 37E238FC08;
	Wed, 19 Nov 2008 14:53:21 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAJErLhI020249;
	Wed, 19 Nov 2008 14:53:21 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAJErLuf020248;
	Wed, 19 Nov 2008 14:53:21 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200811191453.mAJErLuf020248@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Wed, 19 Nov 2008 14:53:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185093 - projects/csup_cvsmode/contrib/csup
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Nov 2008 14:53:21 -0000

Author: lulf
Date: Wed Nov 19 14:53:20 2008
New Revision: 185093
URL: http://svn.freebsd.org/changeset/base/185093

Log:
  - Fixup the rcs revision comparing to be correct this time.

Modified:
  projects/csup_cvsmode/contrib/csup/misc.c

Modified: projects/csup_cvsmode/contrib/csup/misc.c
==============================================================================
--- projects/csup_cvsmode/contrib/csup/misc.c	Wed Nov 19 11:57:16 2008	(r185092)
+++ projects/csup_cvsmode/contrib/csup/misc.c	Wed Nov 19 14:53:20 2008	(r185093)
@@ -578,24 +578,41 @@ bt_free(struct backoff_timer *bt)
 int
 rcsnum_cmp(char *revision1, char *revision2)
 {
-	char *ptr1, *ptr2;
-	
-	ptr1 = revision1;
-	ptr2 = revision2; 
-	while (*ptr1 != '\0' && *ptr2 != '\0') {
-		if (*ptr1 > *ptr2)
-			return (1);
-		else if (*ptr1 < *ptr2)
-			return (-1);
-		ptr1++;
-		ptr2++;
-	};
-
-	if (*ptr1 != '\0' && *ptr2 == '\0')
-		return (1);
-	if (*ptr1 == '\0' && *ptr2 != '\0')
-		return (-1);
-	return (0);
+        char *ptr1, *ptr2, *dot1, *dot2;
+	int num1len, num2len, ret;
+
+        ptr1 = revision1;
+        ptr2 = revision2;
+        while (*ptr1 != '\0' && *ptr2 != '\0') {
+                dot1 = strchr(ptr1, '.');
+                dot2 = strchr(ptr2, '.');
+                if (dot1 == NULL)
+                        dot1 = strchr(ptr1, '\0');
+                if (dot2 == NULL)
+                        dot2 = strchr(ptr2, '\0');
+
+		num1len = dot1 - ptr1;
+		num2len = dot2 - ptr2;
+                /* Check the distance between each, showing how many digits */
+                if (num1len > num2len)
+                        return (1);
+                else if (num1len < num2len)
+                        return (-1);
+
+                /* Equal distance means we must check each character. */
+		ret = strncmp(ptr1, ptr2, num1len);
+		if (ret != 0)
+			return (ret);
+		ptr1 = (*dot1 == '.') ? (dot1 + 1) : dot1;
+		ptr2 = (*dot2 == '.') ? (dot2 + 1) : dot2;
+        } 
+
+        if (*ptr1 != '\0' && *ptr2 == '\0')
+                return (1);
+        if (*ptr1 == '\0' && *ptr2 != '\0')
+                return (-1);
+        return (0);
+
 }
 
 /* Returns 0 if a rcsrev is not a trunk revision number. */