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

snprintf instead of sprintf, 

better support for HUGE files with the -# progress bar
This commit is contained in:
Daniel Stenberg 2004-07-02 12:48:53 +00:00
parent c211a7c685
commit e4caa98901
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -2413,7 +2413,7 @@ static int my_fread(void *buffer, size_t sz, size_t nmemb, void *userp)
struct ProgressData { struct ProgressData {
int calls; int calls;
double prev; curl_off_t prev;
int width; int width;
FILE *out; /* where to write everything to */ FILE *out; /* where to write everything to */
curl_off_t initial_size; curl_off_t initial_size;
@ -2438,21 +2438,23 @@ static int myprogress (void *clientp,
int i; int i;
struct ProgressData *bar = (struct ProgressData *)clientp; struct ProgressData *bar = (struct ProgressData *)clientp;
double total = dltotal + ultotal + bar->initial_size; curl_off_t total = (curl_off_t)dltotal + (curl_off_t)ultotal +
double point = dlnow + ulnow + bar->initial_size; /* we've come this far */ bar->initial_size; /* expected transfer size */
curl_off_t point = (curl_off_t)dlnow + (curl_off_t)ulnow +
bar->initial_size; /* we've come this far */
bar->calls++; /* simply count invokes */ bar->calls++; /* simply count invokes */
if(total < 1) { if(total < 1) {
int prevblock = (int)bar->prev / 1024; curl_off_t prevblock = bar->prev / 1024;
int thisblock = (int)point / 1024; curl_off_t thisblock = point / 1024;
while ( thisblock > prevblock ) { while ( thisblock > prevblock ) {
fprintf( bar->out, "#" ); fprintf( bar->out, "#" );
prevblock++; prevblock++;
} }
} }
else { else {
frac = point / total; frac = (double)point / (double)total;
percent = frac * 100.0f; percent = frac * 100.0f;
barwidth = bar->width - 7; barwidth = bar->width - 7;
num = (int) (((double)barwidth) * frac); num = (int) (((double)barwidth) * frac);
@ -2461,8 +2463,8 @@ static int myprogress (void *clientp,
line[i] = '#'; line[i] = '#';
} }
line[i] = '\0'; line[i] = '\0';
sprintf( format, "%%-%ds %%5.1f%%%%", barwidth ); snprintf( format, sizeof(format), "%%-%ds %%5.1f%%%%", barwidth );
sprintf( outline, format, line, percent ); snprintf( outline, sizeof(outline), format, line, percent );
fprintf( bar->out, "\r%s", outline ); fprintf( bar->out, "\r%s", outline );
} }
fflush(bar->out); fflush(bar->out);