libfile: Simplify read_full()
PATCH 1/2 libfile: Simplify read_full()
We can figure out the amount of written data by substracting 'insize' from 'size' so there is no need to keep a separate counter for that.
Signed-off-by Andrey Smirnov <[email protected]>
--- lib/libfile.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
lib/libfile.c +2 -4
@@ -80,20 +80,18 @@ int read_full(int fd, void *buf, size_t size) {size_t insize = size;int now; -int total =0 ;while (size) { now =read (fd, buf, size);if (now ==0 ) -return total; +break ;if (now <0 )return now; - total += now; size -= now; buf += now; } -return insize; +return insize - size; }EXPORT_SYMBOL (read_full);
Signature · 7 lines
2.21.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/2 libfile: Do not return 0 from write_full()
None of the callers of write_full() expect a zero return value. Given how the documentation explicitly states that either all of the buffer is going to be written out or an error generated, treat 0 retrun from write() as a error, set errno to ENOSPC and return -1.
Same logic applies to pwrite_full() as well, so make the change there while at it.
Signed-off-by Andrey Smirnov <[email protected]>
--- lib/libfile.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
lib/libfile.c +10 -2
@@ -36,7 +36,11 @@ int pwrite_full(int fd, const void *buf, size_t size, loff_t offset)while (size) { now =pwrite (fd, buf, size, offset); -if (now <=0 ) +if (now ==0 ) { + errno =ENOSPC ; +return -1 ; + } +if (now <0 )return now; size -= now; buf += now;
@@ -60,7 +64,11 @@ int write_full(int fd, const void *buf, size_t size)while (size) { now =write (fd, buf, size); -if (now <=0 ) +if (now ==0 ) { + errno =ENOSPC ; +return -1 ; + } +if (now <0 )return now; size -= now; buf += now;
Signature · 7 lines
2.21.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 7 lines · Andrey Smirnov
We can figure out the amount of written data by substracting 'insize' from 'size' so there is no need to keep a separate counter for that.
Signed-off-by Andrey Smirnov <[email protected]>--- lib/libfile.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Applied, thanks
Sascha
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox