search for: refresh_progress_met

...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 */ static int win_size; /* terminal window size */ @@ -128,11 +130,16 @@ 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 = time(NULL); bytes_left = end_pos - cur_pos; + + delta_pos = cur_pos - last_pos; +...

...#include <stdio.h> +#include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> +#include <wchar.h> #include "progressmeter.h" #include "atomicio.h" @@ -117,7 +119,7 @@ format_size(char *buf, int size, off_t b void refresh_progress_meter(void) { - char buf[MAX_WINSIZE + 1]; + char buf[(MAX_WINSIZE * 4) + 1]; time_t now; off_t transferred; double elapsed; @@ -125,8 +127,10 @@ refresh_progress_meter(void) off_t bytes_left; int cur_speed; int hours, minutes, seconds; - int i, len; - int file_len; + int width, size, buf_...

...257,12 +264,16 @@ ? ? ? ?stalled = 0; ? ? ? ?bytes_per_second = 0; - ? ? ? setscreensize(); + ? ? ? if (progresstype) + ? ? ? ? ? ? ? win_size=MAX_WINSIZE; + ? ? ? else { + ? ? ? ? ? ? ? setscreensize(); + ? ? ? ? ? ? ? signal(SIGWINCH, sig_winch); + ? ? ? } ? ? ? ?if (can_output()) ? ? ? ? ? ? ? ?refresh_progress_meter(); ? ? ? ?signal(SIGALRM, update_progress_meter); - ? ? ? signal(SIGWINCH, sig_winch); ? ? ? ?alarm(UPDATE_INTERVAL); ?} @@ -278,7 +289,8 @@ ? ? ? ?if (cur_pos != end_pos) ? ? ? ? ? ? ? ?refresh_progress_meter(); - ? ? ? atomicio(vwrite, STDOUT_FILENO, "\n", 1); + ? ? ? if (progresst...

https://bugzilla.mindrot.org/show_bug.cgi?id=2434 Bug ID: 2434 Summary: scp can send arbitrary control characters / escape sequences to the terminal Product: Portable OpenSSH Version: 6.7p1 Hardware: Other OS: Linux Status: NEW Severity: security Priority: P5