diff options
| -rw-r--r-- | include/progress.h | 6 | ||||
| -rw-r--r-- | lib/libfile.c | 2 | ||||
| -rw-r--r-- | lib/show_progress.c | 17 |
3 files changed, 13 insertions, 12 deletions
diff --git a/include/progress.h b/include/progress.h index 75aa9c4f86..50b15fb12b 100644 --- a/include/progress.h +++ b/include/progress.h @@ -2,15 +2,17 @@ #ifndef __PROGRSS_H #define __PROGRSS_H +#include <linux/types.h> + /* Initialize a progress bar. If max > 0 a one line progress * bar is printed where 'max' corresponds to 100%. If max == 0 * a multi line progress bar is printed. */ -void init_progression_bar(int max); +void init_progression_bar(loff_t max); /* update a progress bar to a new value. If now < 0 then a * spinner is printed. */ -void show_progress(int now); +void show_progress(loff_t now); #endif /* __PROGRSS_H */ diff --git a/lib/libfile.c b/lib/libfile.c index 20bb689a79..4ab8db11ad 100644 --- a/lib/libfile.c +++ b/lib/libfile.c @@ -332,7 +332,7 @@ int copy_file(const char *src, const char *dst, int verbose) int r, s; int ret = 1, err1 = 0; int mode; - int total = 0; + loff_t total = 0; struct stat srcstat, dststat; rw_buf = xmalloc(RW_BUF_SIZE); diff --git a/lib/show_progress.c b/lib/show_progress.c index d797ec28d8..1be06ea780 100644 --- a/lib/show_progress.c +++ b/lib/show_progress.c @@ -17,15 +17,15 @@ #include <common.h> #include <fs.h> #include <progress.h> -#include <asm-generic/div64.h> +#include <linux/math64.h> #define HASHES_PER_LINE 64 -static int printed; -static int progress_max; -static int spin; +static loff_t printed; +static loff_t progress_max; +static unsigned spin; -void show_progress(int now) +void show_progress(loff_t now) { char spinchr[] = "\\|/-"; @@ -35,9 +35,8 @@ void show_progress(int now) } if (progress_max && progress_max != FILESIZE_MAX) { - uint64_t tmp = (int64_t)now * HASHES_PER_LINE; - do_div(tmp, progress_max); - now = tmp; + uint64_t tmp = now * HASHES_PER_LINE; + now = div64_u64(tmp, progress_max); } while (printed < now) { @@ -48,7 +47,7 @@ void show_progress(int now) } } -void init_progression_bar(int max) +void init_progression_bar(loff_t max) { printed = 0; progress_max = max; |