From 4381ab73f5eac877124722f68ad2e8bd178746d8 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Apr 2014 14:39:48 +0000 Subject: openssh: upgrade to 6.2 --- main/openssh/openssh-peaktput.diff | 75 -------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 main/openssh/openssh-peaktput.diff (limited to 'main/openssh/openssh-peaktput.diff') diff --git a/main/openssh/openssh-peaktput.diff b/main/openssh/openssh-peaktput.diff deleted file mode 100644 index d51124294..000000000 --- a/main/openssh/openssh-peaktput.diff +++ /dev/null @@ -1,75 +0,0 @@ -From: Timo Teräs -Date: Tue, 17 Jan 2012 07:45:35 +0000 -Subject: [PATCH 1/2] peakput - ---- - progressmeter.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -diff --git a/progressmeter.c b/progressmeter.c -index 0f95222..6b22511 100644 ---- a/progressmeter.c -+++ b/progressmeter.c -@@ -68,6 +68,8 @@ static time_t last_update; /* last progress update */ - 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 @@ refresh_progress_meter(void) - int hours, minutes, seconds; - int i, len; - int file_len; -+ off_t delta_pos; - - transferred = *counter - cur_pos; - cur_pos = *counter; - now = monotime(); - 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 @@ refresh_progress_meter(void) - - /* 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) -@@ -188,6 +195,15 @@ refresh_progress_meter(void) - (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 +240,7 @@ refresh_progress_meter(void) - - atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1); - last_update = now; -+ last_pos = cur_pos; - } - - /*ARGSUSED*/ --- -1.7.8.3 - -- cgit v1.2.3