search for: remain_m

...*now, int is_last) { + char eol[256]; int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size); unsigned long diff = msdiff(&start_time, now); double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0; @@ -72,10 +74,16 @@ static void rprint_progress(OFF_T ofs, O remain_m = (int) (remain / 60.0) % 60; remain_h = (int) (remain / 3600.0); + if (is_last) { + int todo = stats.num_files - stats.num_untransferred_files + - stats.num_transferred_files; + snprintf(eol, sizeof eol, " (#%d; %d more to check)\n", + stats.num_transferred_files, todo); + }...

...- progress.c 10 Jul 2007 13:55:49 -0000 1.23 +++ progress.c 1 Aug 2007 12:43:33 -0000 @@ -104,9 +104,16 @@ stats.num_files); } else 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); + if (remain < 0) + /* file size increased on sending side during xfer */ + /* so prevent negative times like 0:-1:-49 */ + rprintf(FCLIENT, "%12s %3d%% %7.2f%s ??:??:??%s", + human_num(ofs), pct, rate, units, + eol); + else + rprintf(FCLIENT, "%...

Skipped content of type multipart/mixed-------------- next part -------------- A non-text attachment was scrubbed... Name: PGP.sig Type: application/pgp-signature Size: 186 bytes Desc: This is a digitally signed message part Url : http://lists.samba.org/archive/rsync/attachments/20040227/923b87ee/PGP.bin

...: 0; const char *units; - double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0; + double remain = is_last + ? (double) diff / 1000.0 + : rate ? (double) (size-ofs) / rate / 1000.0 : 0.0; int remain_h, remain_m, remain_s; if (rate > 1024*1024) {

http://bugzilla.mindrot.org/show_bug.cgi?id=1363 Summary: sshd gets stuck: select() in packet_read_seqnr waits indefinitely Product: Portable OpenSSH Version: 4.2p1 Platform: All URL: http://marc.info/?t=117394251600035 OS/Version: All Status: NEW Keywords: patch Severity: major