X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ce8149b6feae51c7a576b04f86003e7a4555ee14..bc63ae3f13e01874e375bb5cc606775889ed5afa:/sender.c diff --git a/sender.c b/sender.c index 212ceba0..93cf8716 100644 --- a/sender.c +++ b/sender.c @@ -20,7 +20,6 @@ #include "rsync.h" extern int verbose; -extern int remote_version; extern int csum_length; extern struct stats stats; extern int io_error; @@ -118,7 +117,7 @@ void send_files(struct file_list *flist,int f_out,int f_in) i = read_int(f_in); if (i == -1) { - if (phase==0 && remote_version >= 13) { + if (phase==0) { phase++; csum_length = SUM_LENGTH; write_int(f_out,-1); @@ -158,8 +157,8 @@ void send_files(struct file_list *flist,int f_out,int f_in) rprintf(FINFO,"send_files(%d,%s)\n",i,fname); if (dry_run) { - if (!am_server) { - log_transfer(file, fname+offset); + if (!am_server && verbose) { /* log transfer */ + rprintf(FINFO, "%s\n", fname+offset); } write_int(f_out,i); continue; @@ -220,8 +219,8 @@ void send_files(struct file_list *flist,int f_out,int f_in) if (!read_batch) rprintf(FINFO,"calling match_sums %s\n",fname); - if (!am_server) { - log_transfer(file, fname+offset); + if (!am_server && verbose) { /* log transfer */ + rprintf(FINFO, "%s\n", fname+offset); } set_compression(fname);