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
Call finish_transfer() with its new arg.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
c5dffc1
..
80b7096
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-27,6
+27,7
@@
extern int dry_run;
extern int am_server;
extern int am_daemon;
extern int protocol_version;
extern int am_server;
extern int am_daemon;
extern int protocol_version;
+extern int make_backups;
extern struct stats stats;
extern struct stats stats;
@@
-71,8
+72,8
@@
static struct sum_struct *receive_sums(int f)
s->sums = NULL;
if (verbose > 3) {
s->sums = NULL;
if (verbose > 3) {
- rprintf(FINFO, "count=%
ld n=%u rem=%u
\n",
- (
long)s->count, s->blength,
s->remainder);
+ rprintf(FINFO, "count=%
.0f n=%ld rem=%ld
\n",
+ (
double)s->count, (long)s->blength, (long)
s->remainder);
}
if (s->count == 0)
}
if (s->count == 0)
@@
-120,6
+121,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
+ int save_make_backups = make_backups;
int j;
if (verbose > 2)
int j;
if (verbose > 2)
@@
-136,6
+138,9
@@
void send_files(struct file_list *flist, int f_out, int f_in)
write_int(f_out, -1);
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
write_int(f_out, -1);
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = 0;
continue;
}
break;
continue;
}
break;
@@
-208,7
+213,11
@@
void send_files(struct file_list *flist, int f_out, int f_in)
return;
}
return;
}
- mbuf = st.st_size ? map_file(fd, st.st_size, s->blength) : NULL;
+ if (st.st_size) {
+ OFF_T map_size = MAX((OFF_T)s->blength * 3, MAX_MAP_SIZE);
+ mbuf = map_file(fd, st.st_size, map_size, s->blength);
+ } else
+ mbuf = NULL;
if (verbose > 2) {
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
if (verbose > 2) {
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
@@
-249,6
+258,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
safe_fname(fname));
}
}
safe_fname(fname));
}
}
+ make_backups = save_make_backups;
if (verbose > 2)
rprintf(FINFO, "send files finished\n");
if (verbose > 2)
rprintf(FINFO, "send files finished\n");