X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8c18ebe81d53ba65546feb5fff89ae574a361343..100018b7cdf4c5df206c16decb07a3c2680bb5e6:/sender.c

diff --git a/sender.c b/sender.c
index c011be69..13709703 100644
--- a/sender.c
+++ b/sender.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
@@ -180,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);