X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8311f1c11e22148d0528da42889d4d555d1e9b3b..9e7530c414bfd975cd7a9d23292bdebcede37cf0:/progress.c

diff --git a/progress.c b/progress.c
index cda9178b..a6010a08 100644
--- a/progress.c
+++ b/progress.c
@@ -26,7 +26,7 @@ extern int am_server;
 
 #define PROGRESS_HISTORY_SECS 5
 
-#if GETPGRP_VOID
+#ifdef GETPGRP_VOID
 #define GETPGRP_ARG
 #else
 #define GETPGRP_ARG 0
@@ -67,17 +67,18 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 
 	if (is_last) {
 		/* Compute stats based on the starting info. */
-		diff = msdiff(&ph_start.time, now);
-		if (!diff)
+		if (!ph_start.time.tv_sec
+		    || !(diff = msdiff(&ph_start.time, now)))
 			diff = 1;
 		rate = (double) (ofs - ph_start.ofs) * 1000.0 / diff / 1024.0;
 		/* Switch to total time taken for our last update. */
 		remain = (double) diff / 1000.0;
 	} else {
 		/* Compute stats based on recent progress. */
-		diff = msdiff(&ph_list[oldest_hpos].time, now);
-		rate = diff ? (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0
-		    / diff / 1024.0 : 0;
+		if (!(diff = msdiff(&ph_list[oldest_hpos].time, now)))
+			diff = 1;
+		rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0
+		     / diff / 1024.0;
 		remain = rate ? (double) (size - ofs) / rate / 1000.0 : 0.0;
 	}
 
@@ -96,10 +97,9 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 	remain_h = (int) (remain / 3600.0);
 
 	if (is_last) {
-		snprintf(eol, sizeof eol, "  (%d, %.1f%% of %d)\n",
+		snprintf(eol, sizeof eol, " (xfer#%d, 2chk=%d/%d)\n",
 			stats.num_transferred_files,
-			(float)((stats.current_file_index+1) * 100)
-				/ stats.num_files,
+			stats.current_file_index+1 - stats.num_files,
 			stats.num_files);
 	} else
 		strcpy(eol, "\r");
@@ -121,7 +121,7 @@ void end_progress(OFF_T size)
 void show_progress(OFF_T ofs, OFF_T size)
 {
 	struct timeval now;
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
 	static pid_t pgrp = -1;
 	pid_t tc_pgrp;
 #endif
@@ -129,7 +129,7 @@ void show_progress(OFF_T ofs, OFF_T size)
 	if (am_server)
 		return;
 
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
 	if (pgrp == -1)
 		pgrp = getpgrp(GETPGRP_ARG);
 #endif
@@ -165,7 +165,7 @@ void show_progress(OFF_T ofs, OFF_T size)
 		ph_list[newest_hpos].ofs = ofs;
 	}
 
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
 	tc_pgrp = tcgetpgrp(STDOUT_FILENO);
 	if (tc_pgrp != pgrp && tc_pgrp != -1)
 		return;