X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/adc2476fa213797d849ae80fa8b5fcd9eba5dc4f..b3bf9b9df95137a3a43248be9599d919b04877af:/sender.c

diff --git a/sender.c b/sender.c
index 2919e553..8506ac66 100644
--- a/sender.c
+++ b/sender.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 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
@@ -20,7 +20,7 @@
  */
 
 #include "rsync.h"
-#include "ifuncs.h"
+#include "inums.h"
 
 extern int dry_run;
 extern int do_xfers;
@@ -201,6 +201,8 @@ void send_files(int f_in, int f_out)
 				break;
 			if (DEBUG_GTE(SEND, 1))
 				rprintf(FINFO, "send_files phase=%d\n", phase);
+			if (phase == 2)
+				read_del_stats(f_in);
 			write_ndx(f_out, NDX_DONE);
 			continue;
 		}
@@ -234,6 +236,21 @@ void send_files(int f_in, int f_out)
 			maybe_log_item(file, iflags, itemizing, xname);
 			write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
 					    fnamecmp_type, xname, xlen);
+			if (iflags & ITEM_IS_NEW) {
+				stats.created_files++;
+				if (S_ISREG(file->mode)) {
+					/* Nothing further to count. */
+				} else if (S_ISDIR(file->mode))
+					stats.created_dirs++;
+#ifdef SUPPORT_LINKS
+				else if (S_ISLNK(file->mode))
+					stats.created_symlinks++;
+#endif
+				else if (IS_DEVICE(file->mode))
+					stats.created_devices++;
+				else
+					stats.created_specials++;
+			}
 			continue;
 		}
 		if (phase == 2) {
@@ -257,6 +274,8 @@ void send_files(int f_in, int f_out)
 				append_mode = -append_mode;
 				csum_length = SHORT_SUM_LENGTH;
 			}
+			if (iflags & ITEM_IS_NEW)
+				stats.created_files++;
 		}
 
 		updating_basis_file = inplace && (protocol_version >= 29
@@ -264,7 +283,7 @@ void send_files(int f_in, int f_out)
 
 		if (!am_server && INFO_GTE(PROGRESS, 1))
 			set_current_file_index(file, ndx);
-		stats.num_transferred_files++;
+		stats.xferred_files++;
 		stats.total_transferred_size += F_LENGTH(file);
 
 		if (!do_xfers) { /* log the transfer */