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
If the user specified --relative and a source dir with a trailing
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
3afc48d
..
a738b42
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-20,7
+20,7
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
-extern int d
ry_run
;
+extern int d
o_xfers
;
extern int am_server;
extern int am_daemon;
extern int log_before_transfer;
extern int am_server;
extern int am_daemon;
extern int log_before_transfer;
@@
-34,6
+34,8
@@
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
extern int inplace;
extern int make_backups;
extern int do_progress;
extern int inplace;
+extern int batch_fd;
+extern int write_batch;
extern struct stats stats;
extern struct file_list *the_file_list;
extern char *log_format;
extern struct stats stats;
extern struct file_list *the_file_list;
extern char *log_format;
@@
-204,6
+206,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
+ int f_xfer = write_batch < 0 ? batch_fd : f_out;
int i, j;
if (verbose > 2)
int i, j;
if (verbose > 2)
@@
-262,7
+265,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
- if (
dry_run
) { /* log the transfer */
+ if (
!do_xfers
) { /* log the transfer */
if (!am_server && log_format)
log_item(file, &stats, iflags, NULL);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
if (!am_server && log_format)
log_item(file, &stats, iflags, NULL);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
@@
-319,7
+322,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
xname, xlen);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
xname, xlen);
- write_sum_head(f_
out
, s);
+ write_sum_head(f_
xfer
, s);
if (verbose > 2) {
rprintf(FINFO, "calling match_sums %s\n",
if (verbose > 2) {
rprintf(FINFO, "calling match_sums %s\n",
@@
-333,7
+336,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
set_compression(fname);
set_compression(fname);
- match_sums(f_
out
, s, mbuf, st.st_size);
+ match_sums(f_
xfer
, s, mbuf, st.st_size);
if (do_progress)
end_progress(st.st_size);
if (do_progress)
end_progress(st.st_size);