Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
One (hopefully) last change to the sanitize_path() code.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
1118beb
..
9e40fcb
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-22,7
+22,6
@@
extern int verbose;
extern int recurse;
extern int verbose;
extern int recurse;
-extern int delete_mode;
extern int delete_after;
extern int max_delete;
extern int csum_length;
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) {
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);
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 (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) {
}
if (partial_dir) {