* [PATCH] lib: Fix copy_file when filesize is FILESIZE_MAX
@ 2013-09-27 7:33 Teresa Gámez
2013-09-27 14:20 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Teresa Gámez @ 2013-09-27 7:33 UTC (permalink / raw)
To: barebox
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>
---
lib/copy_file.c | 8 ++++++--
lib/show_progress.c | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/copy_file.c b/lib/copy_file.c
index ab3d845..55dee38 100644
--- a/lib/copy_file.c
+++ b/lib/copy_file.c
@@ -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;
diff --git a/lib/show_progress.c b/lib/show_progress.c
index bc067ea..98dc849 100644
--- a/lib/show_progress.c
+++ b/lib/show_progress.c
@@ -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");
--
1.7.0.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] lib: Fix copy_file when filesize is FILESIZE_MAX
2013-09-27 7:33 [PATCH] lib: Fix copy_file when filesize is FILESIZE_MAX Teresa Gámez
@ 2013-09-27 14:20 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2013-09-27 14:20 UTC (permalink / raw)
To: Teresa Gámez; +Cc: barebox
On Fri, Sep 27, 2013 at 09:33:21AM +0200, Teresa Gámez wrote:
> 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>
Applied, thanks
Sascha
> ---
> lib/copy_file.c | 8 ++++++--
> lib/show_progress.c | 5 +++--
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/lib/copy_file.c b/lib/copy_file.c
> index ab3d845..55dee38 100644
> --- a/lib/copy_file.c
> +++ b/lib/copy_file.c
> @@ -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;
> diff --git a/lib/show_progress.c b/lib/show_progress.c
> index bc067ea..98dc849 100644
> --- a/lib/show_progress.c
> +++ b/lib/show_progress.c
> @@ -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");
> --
> 1.7.0.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-27 14:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-27 7:33 [PATCH] lib: Fix copy_file when filesize is FILESIZE_MAX Teresa Gámez
2013-09-27 14:20 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox