mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] fixup! libfile: copy_fd: add size argument
@ 2026-01-23 21:58 Ahmad Fatoum
  2026-01-26  8:47 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Ahmad Fatoum @ 2026-01-23 21:58 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

libfile: copy_fd: fix use of zero to mean all content

The function documents that a size of zero means that all data is
copied, but this is currently broken: On first iteration both size and
copied will be zero, so now is set to zero leading to an early exit
without any data copied at all.

One way to fix this is to have size == SIZE_MAX be the way to mean copy
as much data as possible, but let's do as the documentation say and
handle 0 bytes as infinite.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 lib/libfile.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/libfile.c b/lib/libfile.c
index bc79e58a82e4..0435fc4297e1 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -148,7 +148,12 @@ int copy_fd(int in, int out, size_t size)
 		return -ENOMEM;
 
 	while (1) {
-		size_t now = min(bs, size - copied);
+		size_t now;
+
+		if (size)
+			now = min(bs, size - copied);
+		else
+			now = bs;
 
 		if (!now) {
 			ret = 0;
-- 
2.47.3




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] fixup! libfile: copy_fd: add size argument
  2026-01-23 21:58 [PATCH] fixup! libfile: copy_fd: add size argument Ahmad Fatoum
@ 2026-01-26  8:47 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2026-01-26  8:47 UTC (permalink / raw)
  To: barebox, Ahmad Fatoum


On Fri, 23 Jan 2026 22:58:13 +0100, Ahmad Fatoum wrote:
> libfile: copy_fd: fix use of zero to mean all content
> 
> The function documents that a size of zero means that all data is
> copied, but this is currently broken: On first iteration both size and
> copied will be zero, so now is set to zero leading to an early exit
> without any data copied at all.
> 
> [...]

Applied, thanks!

[1/1] fixup! libfile: copy_fd: add size argument
      https://git.pengutronix.de/cgit/barebox/commit/?id=8342363fe8e9 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-01-26  8:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-23 21:58 [PATCH] fixup! libfile: copy_fd: add size argument Ahmad Fatoum
2026-01-26  8:47 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox