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

Fix fetch so that all status information is sent to stderr, prevents

Browse Source 
corruption of file being recieved to stdout.

Submitted-by: Kent Vander Velden <graphix@iastate.edu>

Closes PR#2739
This commit is contained in:
John-Mark Gurney 1997-02-17 04:11:47 +00:00
parent 3e0f6b97b2
commit 429100430f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=22819
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/fetch/main.c
View File

@ -308,8 +308,7 @@ display(struct fetch_state *fs, off_t size, ssize_t n)
size ? "" : " [appending]");
else
asprintf (&s, "Receiving %s", fs->fs_outputfile);
printf ("%s", s);
fflush (stdout);
fprintf (stderr, "%s", s);
bytestart = bytes = n;
return;
}
@ -317,19 +316,20 @@ display(struct fetch_state *fs, off_t size, ssize_t n)
if (n == -1) {
if(stdoutatty) {
if (size > 0)
printf ("\r%s: 100%%", s);
fprintf (stderr, "\r%s: 100%%", s);
else
printf ("\r%s: %qd Kbytes", s, (quad_t)bytes/1024);
fprintf (stderr, "\r%s: %qd Kbytes", s, (quad_t)bytes/1024);
}
bytes -= bytestart;
d = t.tv_sec + t.tv_usec/1.e6 - t_start.tv_sec - t_start.tv_usec/1.e6;
printf ("\n%qd bytes transfered in %.1f seconds", (quad_t)bytes, d);
fprintf (stderr, "\n%qd bytes transfered in %.1f seconds",
(quad_t)bytes, d);
d = bytes/d;
if (d < 1000)
printf (" (%.0f bytes/s)\n", d);
fprintf (stderr, " (%.0f bytes/s)\n", d);
else {
d /=1024;
printf (" (%.2f kB/s)\n", d);
fprintf (stderr, " (%.2f kB/s)\n", d);
}
free(s);
init = 0;
@ -343,12 +343,11 @@ display(struct fetch_state *fs, off_t size, ssize_t n)
pr++;
if(stdoutatty) {
if (size > 1000000)
printf ("\r%s: %2qd%%", s, (quad_t)bytes/(size/100));
fprintf (stderr, "\r%s: %2qd%%", s, (quad_t)bytes/(size/100));
else if (size > 0)
printf ("\r%s: %2qd%%", s, (quad_t)100*bytes/size);
fprintf (stderr, "\r%s: %2qd%%", s, (quad_t)100*bytes/size);
else
printf ("\r%s: %qd kB", s, (quad_t)bytes/1024);
fprintf (stderr, "\r%s: %qd kB", s, (quad_t)bytes/1024);
}
fflush (stdout);
}