X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4fd842f98df4970f6e49a0365dbed60774e56c09..fbd91cae0cadf80229b41ee58394a046974c878c:/match.c diff --git a/match.c b/match.c index 3a663075..8367d158 100644 --- a/match.c +++ b/match.c @@ -6,8 +6,9 @@ * Copyright (C) 2003-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -314,21 +315,23 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len) sum_init(checksum_seed); if (append_mode > 0) { - OFF_T j = 0; - for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) { - if (buf && do_progress) - show_progress(last_match, buf->file_size); - sum_update(map_ptr(buf, last_match, CHUNK_SIZE), - CHUNK_SIZE); - last_match = j; - } - if (last_match < s->flength) { - int32 n = (int32)(s->flength - last_match); - if (buf && do_progress) - show_progress(last_match, buf->file_size); - sum_update(map_ptr(buf, last_match, n), n); - last_match = s->flength; + if (append_mode == 2) { + OFF_T j = 0; + for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) { + if (buf && do_progress) + show_progress(last_match, buf->file_size); + sum_update(map_ptr(buf, last_match, CHUNK_SIZE), + CHUNK_SIZE); + last_match = j; + } + if (last_match < s->flength) { + int32 n = (int32)(s->flength - last_match); + if (buf && do_progress) + show_progress(last_match, buf->file_size); + sum_update(map_ptr(buf, last_match, n), n); + } } + last_match = s->flength; s->count = 0; }