src/usr.bin/ftp/util.c - diff

Return to util.c CVS log

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

version 1.92, 2019/11/18 04:37:35

version 1.93, 2020/07/06 17:11:29

Line 921

ptransfer(int siginfo)

{

struct timespec now, td;

double elapsed;

double elapsed, pace;

off_t bs;

int meg, remaining, hh;

char buf[100];

Line 937

if (bs > (1024 * 1024))

meg = 1;

/* XXX floating point printf in signal handler */

pace = bs / (1024.0 * (meg ? 1024.0 : 1.0));

(void)snprintf(buf, sizeof(buf),

"%lld byte%s %s in %.2f seconds (%.2f %sB/s)\n",

"%lld byte%s %s in %lld.%02d seconds (%lld.%02d %sB/s)\n",

(long long)bytes, bytes == 1 ? "" : "s", direction, elapsed,

(long long)bytes, bytes == 1 ? "" : "s", direction,

bs / (1024.0 * (meg ? 1024.0 : 1.0)), meg ? "M" : "K");

(long long)elapsed, (int)(elapsed * 100.0) % 100,

(long long)pace, (int)(pace * 100.0) % 100,

meg ? "M" : "K");

if (siginfo && bytes > 0 && elapsed > 0.0 && filesize >= 0 &&

bytes + restart_point <= filesize) {