source: npl/fileserver/rsync/progress-hack.patch @ a2d969e

Only in rsync-3.0.9: config.h.in
Only in rsync-3.0.9: configure.sh
Only in rsyncp/: debian
diff -u -r rsync-3.0.9/options.c rsyncp/options.c
--- rsync-3.0.9/options.c       2011-09-13 22:41:26.000000000 +0000
+++ rsyncp/options.c    2013-06-03 12:23:58.000000000 +0000
@@ -1543,8 +1543,9 @@
                log_before_transfer = !am_server;
        }
 
-       if (do_progress && !verbose && !log_before_transfer && !am_server)
-               verbose = 1;
+/* if (do_progress && !verbose && !log_before_transfer && !am_server)
+verbose = 1; */
+
 
        if (dry_run)
                do_xfers = 0;
diff -u -r rsync-3.0.9/progress.c rsyncp/progress.c
--- rsync-3.0.9/progress.c      2009-01-17 21:41:35.000000000 +0000
+++ rsyncp/progress.c   2013-06-03 12:55:48.000000000 +0000
@@ -61,6 +61,8 @@
  * printed for this file, so we should output a newline.  (Not
  * necessarily the same as all bytes being received.)
  **/
+int64 progressed_bytes=0;
+int64 last_mb=0;
 static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                            int is_last)
 {
@@ -70,6 +72,9 @@
        unsigned long diff;
        double rate, remain;
 
+       
+       int64 this_mb=0;
+       
        if (is_last) {
                /* Compute stats based on the starting info. */
                if (!ph_start.time.tv_sec
@@ -78,6 +83,8 @@
                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;
+               progressed_bytes+=size;
+               this_mb=progressed_bytes/1000000;
        } else {
                /* Compute stats based on recent progress. */
                if (!(diff = msdiff(&ph_list[oldest_hpos].time, now)))
@@ -85,6 +92,13 @@
                rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0
                     / diff / 1024.0;
                remain = rate ? (double) (size - ofs) / rate / 1000.0 : 0.0;
+
+               this_mb=(progressed_bytes+ofs)/1000000;
+       }
+       
+       if (this_mb!=last_mb){
+           last_mb=this_mb;
+           rprintf(FCLIENT, "%d\n", this_mb);
        }
 
        if (rate > 1024*1024) {
@@ -114,8 +128,10 @@
        } else
                strlcpy(eol, "\r", sizeof eol);
        progress_is_active = 0;
-       rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
-               human_num(ofs), pct, rate, units, rembuf, eol);
+/*     rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
+               human_num(ofs), pct, rate, units, rembuf, eol);*/
+               
+       
        if (!is_last)
                progress_is_active = 1;
 }
Only in rsyncp/: progress.c.orig
Only in rsync-3.0.9: proto.h
Only in rsync-3.0.9: proto.h-tstamp
Only in rsync-3.0.9: rsync.1
Only in rsync-3.0.9: rsyncd.conf.5
diff -u -r rsync-3.0.9/support/rrsync rsyncp/support/rrsync
--- rsync-3.0.9/support/rrsync  2010-06-30 16:17:13.000000000 +0000
+++ rsyncp/support/rrsync       2013-06-03 11:58:16.000000000 +0000
@@ -31,7 +31,7 @@
 # command="rrsync logs/client" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzGhEeNlPr...
 # command="rrsync -ro results" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAmkHG1WCjC...
 #
-# Format of the envrionment variables set by sshd:
+# Format of the environment variables set by sshd:
 # SSH_ORIGINAL_COMMAND=rsync --server          -vlogDtpr --partial . ARG # push
 # SSH_ORIGINAL_COMMAND=rsync --server --sender -vlogDtpr --partial . ARGS # pull
 # SSH_CONNECTION=client_addr client_port server_port