moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved the looks of the progress meter when the file size is between 

9999 KB and 100 MB since it then can display the size as XX.X MB instead of
just XX as before.
This commit is contained in:
Daniel Stenberg 2000-04-08 19:28:23 +00:00
parent cd9ad9e54b
commit eb856b04fe
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/progress.c
View File

@ -72,15 +72,23 @@ void time2str(char *r, int t)
but never longer than 5 columns. Add suffix k, M, G when suitable... */
char *max5data(double bytes, char *max5)
{
#define ONE_KILOBYTE 1024
#define ONE_MEGABYTE (1024*1024)
if(bytes < 100000) {
sprintf(max5, "%5d", (int)bytes);
return max5;
}
if(bytes < (9999*1024)) {
sprintf(max5, "%4dk", (int)bytes/1024);
if(bytes < (9999*ONE_KILOBYTE)) {
sprintf(max5, "%4dk", (int)bytes/ONE_KILOBYTE);
return max5;
}
sprintf(max5, "%4dM", (int)bytes/(1024*1024));
if(bytes < (100*ONE_MEGABYTE)) {
/* 'XX.XM' is good as long as we're less than 100 megs */
sprintf(max5, "%2.1fM", bytes/ONE_MEGABYTE);
return max5;
}
sprintf(max5, "%4dM", (int)bytes/ONE_MEGABYTE);
return max5;
}