src/usr.bin/ssh/progressmeter.c - diff

Return to progressmeter.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.41, 2015/01/14 13:54:13

version 1.42, 2016/03/02 22:42:40

Line 61

/* signal handler for updating the progress meter */

static void update_progress_meter(int);

static time_t start; /* start progress */

static double start; /* start progress */

static time_t last_update; /* last progress update */

static double last_update; /* last progress update */

static const char *file; /* name of the file being transferred */

static off_t start_pos; /* initial position of transfer */

static off_t end_pos; /* ending position of transfer */

Line 118

refresh_progress_meter(void)

{

char buf[MAX_WINSIZE + 1];

time_t now;

off_t transferred;

double elapsed;

double elapsed, now;

int percent;

off_t bytes_left;

int cur_speed;

Line 130

Line 129

transferred = *counter - (cur_pos ? cur_pos : start_pos);

cur_pos = *counter;

now = monotime();

now = monotime_double();

bytes_left = end_pos - cur_pos;

if (bytes_left > 0)

Line 248

Line 247

void

start_progress_meter(const char *f, off_t filesize, off_t *ctr)

{

start = last_update = monotime();

start = last_update = monotime_double();

file = f;

start_pos = *ctr;

end_pos = filesize;