Use umask kluge from rsync.fns to try to get rid of a potential

[rsync/rsync.git] / progress.c

diff --git a/progress.c b/progress.c
index da1682d..8192c35 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -26,6 +26,12 @@ extern int am_server;
 
 #define PROGRESS_HISTORY_SECS 5
 
+#ifdef GETPGRP_VOID
+#define GETPGRP_ARG
+#else
+#define GETPGRP_ARG 0
+#endif
+
 struct progress_history {
        struct timeval time;
        OFF_T ofs;
@@ -61,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;
        }
 
@@ -115,10 +122,19 @@ void end_progress(OFF_T size)
 void show_progress(OFF_T ofs, OFF_T size)
 {
        struct timeval now;
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
+       static pid_t pgrp = -1;
+       pid_t tc_pgrp;
+#endif
 
        if (am_server)
                return;
 
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
+       if (pgrp == -1)
+               pgrp = getpgrp(GETPGRP_ARG);
+#endif
+
        gettimeofday(&now, NULL);
 
        if (!ph_start.time.tv_sec) {
@@ -150,5 +166,11 @@ void show_progress(OFF_T ofs, OFF_T size)
                ph_list[newest_hpos].ofs = ofs;
        }
 
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
+       tc_pgrp = tcgetpgrp(STDOUT_FILENO);
+       if (tc_pgrp != pgrp && tc_pgrp != -1)
+               return;
+#endif
+
        rprint_progress(ofs, size, &now, False);
 }