mirror of
https://abf.rosa.ru/djam/openssh.git
synced 2025-02-24 10:13:00 +00:00
72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
--- ../openssh-5.1p1/progressmeter.c 2006-08-04 22:39:40.000000000 -0400
|
|
+++ ./progressmeter.c 2008-07-29 14:33:13.000000000 -0400
|
|
@@ -68,6 +68,8 @@
|
|
static char *file; /* name of the file being transferred */
|
|
static off_t end_pos; /* ending position of transfer */
|
|
static off_t cur_pos; /* transfer position as of last refresh */
|
|
+static off_t last_pos;
|
|
+static off_t max_delta_pos = 0;
|
|
static volatile off_t *counter; /* progress counter */
|
|
static long stalled; /* how long we have been stalled */
|
|
static int bytes_per_second; /* current speed in bytes per second */
|
|
@@ -128,12 +130,17 @@
|
|
int hours, minutes, seconds;
|
|
int i, len;
|
|
int file_len;
|
|
+ off_t delta_pos;
|
|
|
|
transferred = *counter - cur_pos;
|
|
cur_pos = *counter;
|
|
now = time(NULL);
|
|
bytes_left = end_pos - cur_pos;
|
|
|
|
+ delta_pos = cur_pos - last_pos;
|
|
+ if (delta_pos > max_delta_pos)
|
|
+ max_delta_pos = delta_pos;
|
|
+
|
|
if (bytes_left > 0)
|
|
elapsed = now - last_update;
|
|
else {
|
|
@@ -158,7 +165,7 @@
|
|
|
|
/* filename */
|
|
buf[0] = '\0';
|
|
- file_len = win_size - 35;
|
|
+ file_len = win_size - 45;
|
|
if (file_len > 0) {
|
|
len = snprintf(buf, file_len + 1, "\r%s", file);
|
|
if (len < 0)
|
|
@@ -175,7 +182,8 @@
|
|
percent = ((float)cur_pos / end_pos) * 100;
|
|
else
|
|
percent = 100;
|
|
- snprintf(buf + strlen(buf), win_size - strlen(buf),
|
|
+
|
|
+ snprintf(buf + strlen(buf), win_size - strlen(buf-8),
|
|
" %3d%% ", percent);
|
|
|
|
/* amount transferred */
|
|
@@ -188,6 +196,15 @@
|
|
(off_t)bytes_per_second);
|
|
strlcat(buf, "/s ", win_size);
|
|
|
|
+ /* instantaneous rate */
|
|
+ if (bytes_left > 0)
|
|
+ format_rate(buf + strlen(buf), win_size - strlen(buf),
|
|
+ delta_pos);
|
|
+ else
|
|
+ format_rate(buf + strlen(buf), win_size - strlen(buf),
|
|
+ max_delta_pos);
|
|
+ strlcat(buf, "/s ", win_size);
|
|
+
|
|
/* ETA */
|
|
if (!transferred)
|
|
stalled += elapsed;
|
|
@@ -224,6 +241,7 @@
|
|
|
|
atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1);
|
|
last_update = now;
|
|
+ last_pos = cur_pos;
|
|
}
|
|
|
|
/*ARGSUSED*/
|