X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9ae7a2cddbb19d14e1b4453cfd40d840ea3042d2..7a2fa0c2d3ffa9288140b738b65e4eabb7e596c2:/sender.c diff --git a/sender.c b/sender.c index b0799550..ddf4fd6d 100644 --- a/sender.c +++ b/sender.c @@ -26,7 +26,7 @@ extern int verbose; extern int do_xfers; extern int am_server; extern int am_daemon; -extern int incremental; +extern int inc_recurse; extern int log_before_transfer; extern int stdout_format_has_i; extern int logfile_format_has_i; @@ -44,7 +44,6 @@ extern int batch_fd; extern int write_batch; extern struct stats stats; extern struct file_list *cur_flist, *first_flist; -extern char *stdout_format; /** * @file @@ -181,14 +180,14 @@ void send_files(int f_in, int f_out) rprintf(FINFO, "send_files starting\n"); while (1) { - if (incremental) + if (inc_recurse) send_extra_file_list(f_out, 1000); /* This call also sets cur_flist. */ ndx = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type, xname, &xlen); if (ndx == NDX_DONE) { - if (incremental && first_flist) { + if (inc_recurse && first_flist) { flist_free(first_flist); if (first_flist) { write_ndx(f_out, NDX_DONE);