Add safety check for local --remove-source-files.

[rsync.git] / progress.c

diff --git a/progress.c b/progress.c
index 318a77f0b26e57341228a4b5e6f5303421e796ef..87207fbfa8c2814e83cb5e24e213c5b5f03cbfbb 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2022 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
@@ -25,11 +25,15 @@
 
 extern int am_server;
 extern int flist_eof;
+extern int quiet;
 extern int need_unsorted_flist;
 extern int output_needs_newline;
+extern int stdout_format_has_i;
 extern struct stats stats;
 extern struct file_list *cur_flist;
 
+BOOL want_progress_now = False;
+
 #define PROGRESS_HISTORY_SECS 5
 
 #ifdef GETPGRP_VOID
@@ -62,8 +66,7 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
  * printed for this file, so we should output a newline.  (Not
  * necessarily the same as all bytes being received.)
  **/
-static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
-                           int is_last)
+static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, int is_last)
 {
        char rembuf[64], eol[128];
        const char *units;
@@ -88,8 +91,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                        is_last = 0;
                }
                /* Compute stats based on the starting info. */
-               if (!ph_start.time.tv_sec
-                   || !(diff = msdiff(&ph_start.time, now)))
+               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. */
@@ -99,8 +101,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                /* Compute stats based on recent progress. */
                if (!(diff = msdiff(&ph_list[oldest_hpos].time, now)))
                        diff = 1;
-               rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0
-                    / diff / 1024.0;
+               rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0 / diff / 1024.0;
                remain = rate ? (double) (size - ofs) / rate / 1000.0 : 0.0;
        }
 
@@ -114,25 +115,35 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                units = "kB/s";
        }
 
-       if (remain < 0)
+       if (remain < 0 || remain > 9999.0 * 3600.0)
                strlcpy(rembuf, "  ??:??:??", sizeof rembuf);
        else {
-               snprintf(rembuf, sizeof rembuf, "%4d:%02d:%02d",
-                        (int) (remain / 3600.0),
-                        (int) (remain / 60.0) % 60,
-                        (int) remain % 60);
+               snprintf(rembuf, sizeof rembuf, "%4u:%02u:%02u",
+                        (unsigned int) (remain / 3600.0),
+                        (unsigned int) (remain / 60.0) % 60,
+                        (unsigned int) remain % 60);
        }
 
        output_needs_newline = 0;
        pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
        rprintf(FCLIENT, "\r%15s %3d%% %7.2f%s %s%s",
                human_num(ofs), pct, rate, units, rembuf, eol);
-       if (!is_last) {
+       if (!is_last && !quiet) {
                output_needs_newline = 1;
                rflush(FCLIENT);
        }
 }
 
+void progress_init(void)
+{
+       if (!am_server && !INFO_GTE(PROGRESS, 1)) {
+               struct timeval now;
+               gettimeofday(&now, NULL);
+               ph_start.time.tv_sec = now.tv_sec;
+               ph_start.time.tv_usec = now.tv_usec;
+       }
+}
+
 void set_current_file_index(struct file_struct *file, int ndx)
 {
        if (!file)
@@ -144,12 +155,21 @@ void set_current_file_index(struct file_struct *file, int ndx)
        current_file_index -= cur_flist->flist_num;
 }
 
+void instant_progress(const char *fname)
+{
+       /* We only get here if want_progress_now is True */
+       if (!stdout_format_has_i && !INFO_GTE(NAME, 1))
+               rprintf(FINFO, "%s\n", fname);
+       end_progress(0);
+       want_progress_now = False;
+}
+
 void end_progress(OFF_T size)
 {
        if (!am_server) {
                struct timeval now;
                gettimeofday(&now, NULL);
-               if (INFO_GTE(PROGRESS, 2)) {
+               if (INFO_GTE(PROGRESS, 2) || want_progress_now) {
                        rprint_progress(stats.total_transferred_size,
                                        stats.total_size, &now, True);
                } else {