summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorlulf <lulf@FreeBSD.org>2008-11-20 12:23:44 +0000
committerlulf <lulf@FreeBSD.org>2008-11-20 12:23:44 +0000
commitfb66787b9acf96b57104fb0c08c19208b648f868 (patch)
treebcc1169340a5dc68ff386e7fa9c0408190205459 /contrib
parentb389e1bc700b4a28122ab88274772ce7759c10ac (diff)
downloadFreeBSD-src-fb66787b9acf96b57104fb0c08c19208b648f868.zip
FreeBSD-src-fb66787b9acf96b57104fb0c08c19208b648f868.tar.gz
- Fix issues that prevented rsync support from working.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/csup/rsyncfile.c2
-rw-r--r--contrib/csup/updater.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/csup/rsyncfile.c b/contrib/csup/rsyncfile.c
index f256ccf..3d5c8a5 100644
--- a/contrib/csup/rsyncfile.c
+++ b/contrib/csup/rsyncfile.c
@@ -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;
diff --git a/contrib/csup/updater.c b/contrib/csup/updater.c
index 8ae043e..fd67f61 100644
--- a/contrib/csup/updater.c
+++ b/contrib/csup/updater.c
@@ -2078,7 +2078,7 @@ updater_rsync(struct updater *up, struct file_update *fup, size_t blocksize)
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);
OpenPOWER on IntegriCloud