Tweaking the license text a bit more.

[rsync/rsync.git] / progress.c

diff --git a/progress.c b/progress.c
index 0cb5060..73ad838 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -1,12 +1,14 @@
-/*  -*- c-file-style: "linux" -*-
+/*
+ * Routines to output progress information during a file transfer.
  *
- * Copyright (C) 1996-2000 by Andrew Tridgell
- * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,9 +16,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -26,6 +27,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 +68,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;
        }
 
@@ -90,15 +98,14 @@ 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, to-check=%d/%d)\n",
                        stats.num_transferred_files,
-                       (float)((stats.current_file_index+1) * 100)
-                               / stats.num_files,
+                       stats.num_files - stats.current_file_index - 1,
                        stats.num_files);
        } else
-               strcpy(eol, "\r");
-       rprintf(FINFO, "%12.0f %3d%% %7.2f%s %4d:%02d:%02d%s",
-               (double) ofs, pct, rate, units,
+               strlcpy(eol, "\r", sizeof eol);
+       rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s",
+               human_num(ofs), pct, rate, units,
                remain_h, remain_m, remain_s, eol);
 }
 
@@ -115,7 +122,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
@@ -123,14 +130,9 @@ void show_progress(OFF_T ofs, OFF_T size)
        if (am_server)
                return;
 
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
-       if (pgrp == -1) {
-# if GETPGRP_VOID
-               pgrp = getpgrp();
-# else
-               pgrp = getpgrp(0);
-# endif
-       }
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
+       if (pgrp == -1)
+               pgrp = getpgrp(GETPGRP_ARG);
 #endif
 
        gettimeofday(&now, NULL);
@@ -164,7 +166,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;