sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

lib: Fix copy_file when filesize is FILESIZE_MAX 

Using tftp command does not work proper when files
have FILESIZE_MAX, as copy_file and show_progress
can not handle it. Check the file size for FILESIZE_MAX
and handle it as file size = 0.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Teresa Gámez 2013-09-27 09:33:21 +02:00 committed by Sascha Hauer
parent 8d7f51aeea
commit e2b67d6a6a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/copy_file.c
View File

@ -63,8 +63,12 @@ int copy_file(const char *src, const char *dst, int verbose)
total += w;
}
if (verbose)
show_progress(statbuf.st_size ? total : total / 16384);
if (verbose) {
if (statbuf.st_size && statbuf.st_size != FILESIZE_MAX)
show_progress(total);
else
show_progress(total / 16384);
}
}
ret = 0;

5
lib/show_progress.c
View File

@ -18,6 +18,7 @@
*/
#include <common.h>
#include <fs.h>
#include <progress.h>
#include <asm-generic/div64.h>
#include <linux/stringify.h>
@ -37,7 +38,7 @@ void show_progress(int now)
return;
}
if (progress_max) {
if (progress_max && progress_max != FILESIZE_MAX) {
uint64_t tmp = (int64_t)now * HASHES_PER_LINE;
do_div(tmp, progress_max);
now = tmp;
@ -56,7 +57,7 @@ void init_progression_bar(int max)
printed = 0;
progress_max = max;
spin = 0;
if (progress_max)
if (progress_max && progress_max != FILESIZE_MAX)
printf("\t[%"__stringify(HASHES_PER_LINE)"s]\r\t[", "");
else
printf("\t");