X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a7260c403733b10e3d25abf334441f3ed4cc3b91..6558854dbe14f62cb3713da897b55b9dbaac43eb:/receiver.c diff --git a/receiver.c b/receiver.c index 1118beb7..9e40fcbf 100644 --- a/receiver.c +++ b/receiver.c @@ -22,7 +22,6 @@ extern int verbose; extern int recurse; -extern int delete_mode; extern int delete_after; extern int max_delete; extern int csum_length; @@ -223,7 +222,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, read_sum_head(f_in, &sum); if (fd_r >= 0 && size_r > 0) { - mapbuf = map_file(fd_r, size_r, sum.blength); + OFF_T map_size = MAX(sum.blength * 2, 16*1024); + mapbuf = map_file(fd_r, size_r, map_size, sum.blength); if (verbose > 2) { rprintf(FINFO, "recv mapped %s of size %.0f\n", safe_fname(fname_r), (double)size_r); @@ -426,13 +426,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) if (server_exclude_list.head && check_exclude(&server_exclude_list, fname, S_ISDIR(file->mode)) < 0) { - if (verbose) { - rprintf(FINFO, - "skipping server-excluded update for \"%s\"\n", - safe_fname(fname)); - } - discard_receive_data(f_in, file->length); - continue; + rprintf(FERROR, "attempt to hack rsync failed.\n"); + exit_cleanup(RERR_PROTOCOL); } if (partial_dir) {