Attachment 980 Details for Bug 2390 – Proposed sender.c / receiver.c patch

[patch] Proposed sender.c / receiver.c patch

stats_patch.txt (text/plain), 1.51 KB, created by David Wood on 2005-02-24 17:21:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Wood

Created: 2005-02-24 17:21:41 UTC

Size: 1.51 KB

patch

obsolete

>--- sender.c	2005-02-24 18:57:03.148442000 -0500
>+++ sender_new.c	2005-02-24 19:08:07.652440000 -0500
>@@ -215,8 +215,6 @@
> 		}
> 
> 		stats.current_file_index = i;
>-		stats.num_transferred_files++;
>-		stats.total_transferred_size += file->length;
> 
> 		if (dry_run) { /* log the transfer */
> 			if (!am_server && log_format)
>@@ -227,8 +225,6 @@
> 			continue;
> 		}
> 
>-		initial_stats = stats;
>-
> 		if (!(s = receive_sums(f_in))) {
> 			io_error |= IOERR_GENERAL;
> 			rprintf(FERROR, "receive_sums failed\n");
>@@ -291,6 +287,10 @@
> 
> 		set_compression(fname);
> 
>+		stats.num_transferred_files++;
>+		stats.total_transferred_size += file->length;
>+		initial_stats = stats;
>+
> 		match_sums(f_out, s, mbuf, st.st_size);
> 		if (!log_before_transfer)
> 			log_send(file, &initial_stats, iflags);
>
>--- receiver.c	2005-02-24 18:57:11.048440000 -0500
>+++ receiver_new.c	2005-02-24 19:12:14.904440000 -0500
>@@ -460,8 +460,6 @@
> 		}
> 
> 		stats.current_file_index = i;
>-		stats.num_transferred_files++;
>-		stats.total_transferred_size += file->length;
> 		cleanup_got_literal = 0;
> 
> 		if (server_filter_list.head
>@@ -526,8 +524,6 @@
> 		} else
> 			fnamecmp = fname;
> 
>-		initial_stats = stats;
>-
> 		/* open the file */
> 		fd1 = do_open(fnamecmp, O_RDONLY, 0);
> 
>@@ -624,6 +620,10 @@
> 		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
> 				       fname, fd2, file->length);
> 
>+		stats.num_transferred_files++;
>+		stats.total_transferred_size += file->length;
>+		initial_stats = stats;
>+
> 		if (!log_before_transfer)
> 			log_recv(file, &initial_stats, iflags);
>

Actions: View

Attachments on bug 2390: 980