X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/304f127f561d1ac3e2211fadc84e5a4c085b53c1..ae2836325f77311fdaaf9f5a82d13fedfa3312bb:/progress.c

diff --git a/progress.c b/progress.c
index da1682da..0cb5060a 100644
--- a/progress.c
+++ b/progress.c
@@ -115,10 +115,24 @@ void end_progress(OFF_T size)
 void show_progress(OFF_T ofs, OFF_T size)
 {
 	struct timeval now;
+#if HAVE_GETPGRP && HAVE_TCGETPGRP
+	static pid_t pgrp = -1;
+	pid_t tc_pgrp;
+#endif
 
 	if (am_server)
 		return;
 
+#if HAVE_GETPGRP && HAVE_TCGETPGRP
+	if (pgrp == -1) {
+# if GETPGRP_VOID
+		pgrp = getpgrp();
+# else
+		pgrp = getpgrp(0);
+# endif
+	}
+#endif
+
 	gettimeofday(&now, NULL);
 
 	if (!ph_start.time.tv_sec) {
@@ -150,5 +164,11 @@ void show_progress(OFF_T ofs, OFF_T size)
 		ph_list[newest_hpos].ofs = ofs;
 	}
 
+#if HAVE_GETPGRP && HAVE_TCGETPGRP
+	tc_pgrp = tcgetpgrp(STDOUT_FILENO);
+	if (tc_pgrp != pgrp && tc_pgrp != -1)
+		return;
+#endif
+
 	rprint_progress(ofs, size, &now, False);
 }