d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert the previous delta and apply a better fix which corrects

Browse Source 
a check on the final snprintf and reduces duplicated code.

Submitted by:	brian
This commit is contained in:
Mike Barcroft 2001-08-30 17:13:15 +00:00
parent 1e670ee4e8
commit ad6c0a3768
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=82579
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/ftp/util.c
View File

@ -670,22 +670,16 @@ progressmeter(flag)
if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) { if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
n = snprintf(buf + len, sizeof(buf) - len, n = snprintf(buf + len, sizeof(buf) - len,
" --:-- ETA"); " --:-- ETA");
if (n > 0 && n < sizeof(buf) - len)
len += n;
} else if (wait.tv_sec >= STALLTIME) { } else if (wait.tv_sec >= STALLTIME) {
n = snprintf(buf + len, sizeof(buf) - len, n = snprintf(buf + len, sizeof(buf) - len,
" - stalled -"); " - stalled -");
if (n > 0 && n < sizeof(buf) - len)
len += n;
} else { } else {
remaining = remaining =
((filesize - restart_point) / (bytes / elapsed) - elapsed); ((filesize - restart_point) / (bytes / elapsed) - elapsed);
if (remaining >= 100 * SECSPERHOUR) { if (remaining >= 100 * SECSPERHOUR)
n = snprintf(buf + len, sizeof(buf) - len, n = snprintf(buf + len, sizeof(buf) - len,
" --:-- ETA"); " --:-- ETA");
if (n > 0 && n < sizeof(buf) - len) else {
len += n;
} else {
i = remaining / SECSPERHOUR; i = remaining / SECSPERHOUR;
if (i) if (i)
n = snprintf(buf + len, sizeof(buf) - len, n = snprintf(buf + len, sizeof(buf) - len,
@ -696,10 +690,12 @@ progressmeter(flag)
if (n > 0 && n < sizeof(buf) - len) if (n > 0 && n < sizeof(buf) - len)
len += n; len += n;
i = remaining % SECSPERHOUR; i = remaining % SECSPERHOUR;
len += snprintf(buf + len, sizeof(buf) - len, n = snprintf(buf + len, sizeof(buf) - len,
"%02d:%02d ETA", i / 60, i % 60); "%02d:%02d ETA", i / 60, i % 60);
} }
} }
if (n > 0 && n < sizeof(buf) - len)
len += n;
(void)write(STDOUT_FILENO, buf, len); (void)write(STDOUT_FILENO, buf, len);
if (flag == -1) { if (flag == -1) {