Add some temp-name dot heuristics for OS X's sake.

[rsync/rsync.git] / progress.c

diff --git a/progress.c b/progress.c
index b09ca11..ac010fd 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-2008 Wayne Davison
+ * Copyright (C) 2003-2009 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
@@ -21,11 +21,12 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
 
 extern int am_server;
+extern int flist_eof;
 extern int need_unsorted_flist;
 extern int output_needs_newline;
-extern int human_readable;
 extern struct stats stats;
 extern struct file_list *cur_flist;
 
@@ -72,8 +73,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 
        if (is_last) {
                int len = snprintf(eol, sizeof eol,
-                       " (xfer#%d, to-check=%d/%d)\n",
-                       stats.num_transferred_files,
+                       " (xfr#%d, %s-chk=%d/%d)\n",
+                       stats.xferred_files, flist_eof ? "to" : "ir",
                        stats.num_files - current_file_index - 1,
                        stats.num_files);
                if (INFO_GTE(PROGRESS, 2)) {
@@ -124,8 +125,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 
        output_needs_newline = 0;
        pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
-       rprintf(FCLIENT, "\r%12s %3d%% %7.2f%s %s%s",
-               big_num(ofs, human_readable), pct, rate, units, rembuf, eol);
+       rprintf(FCLIENT, "\r%15s %3d%% %7.2f%s %s%s",
+               human_num(ofs), pct, rate, units, rembuf, eol);
        if (!is_last) {
                output_needs_newline = 1;
                rflush(FCLIENT);