From owner-svn-src-projects@FreeBSD.ORG  Thu Nov 20 12:23:44 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 E0EC91065670;
	Thu, 20 Nov 2008 12:23:44 +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 CD57E8FC0C;
	Thu, 20 Nov 2008 12:23:44 +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 mAKCNiu4051419;
	Thu, 20 Nov 2008 12:23:44 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAKCNij2051417;
	Thu, 20 Nov 2008 12:23:44 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200811201223.mAKCNij2051417@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Thu, 20 Nov 2008 12:23:44 +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: r185128 - 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: Thu, 20 Nov 2008 12:23:45 -0000

Author: lulf
Date: Thu Nov 20 12:23:44 2008
New Revision: 185128
URL: http://svn.freebsd.org/changeset/base/185128

Log:
  - Fix issues that prevented rsync support from working.

Modified:
  projects/csup_cvsmode/contrib/csup/rsyncfile.c
  projects/csup_cvsmode/contrib/csup/updater.c

Modified: projects/csup_cvsmode/contrib/csup/rsyncfile.c
==============================================================================
--- projects/csup_cvsmode/contrib/csup/rsyncfile.c	Thu Nov 20 10:48:01 2008	(r185127)
+++ projects/csup_cvsmode/contrib/csup/rsyncfile.c	Thu Nov 20 12:23:44 2008	(r185128)
@@ -140,7 +140,7 @@ rsync_chooseblocksize(size_t fsize)
 	}
 
 	bestrem = MAXBLOCKSIZE;
-	for (bs = losearch; bs <= hisearch;) {
+	for (bs = losearch; bs <= hisearch; bs++) {
 		rem = fsize % bs;
 		if (rem < bestrem) {
 			bestrem = rem;

Modified: projects/csup_cvsmode/contrib/csup/updater.c
==============================================================================
--- projects/csup_cvsmode/contrib/csup/updater.c	Thu Nov 20 10:48:01 2008	(r185127)
+++ projects/csup_cvsmode/contrib/csup/updater.c	Thu Nov 20 12:23:44 2008	(r185128)
@@ -2078,7 +2078,7 @@ updater_rsync(struct updater *up, struct
 		if (proto_get_sizet(&line, &blockcount, 10) != 0)
 			goto bad;
 		/* Read blocks from original file. */
-		lseek(orig, SEEK_SET, (blocksize * blockstart));
+		lseek(orig, (blocksize * blockstart), SEEK_SET);
 		error = UPDATER_ERR_MSG;
 		for (blocknum = 0; blocknum < blockcount; blocknum++) {
 			nbytes = read(orig, buf, blocksize);