svn commit: r185128 - projects/csup_cvsmode/contrib/csup

[Ulf Lilleengen]

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);